Merge branch 'master' of /home/nimrod/Documents/Shore/Ansible/example

# Conflicts:
#	.travis.yml
#	molecule.yml
#	tasks/main.yml

.pre-commit-config.yaml

@@ -9,7 +9,7 @@
     -   id: flake8
     -   id: check-symlinks
 -   repo: https://github.com/adarnimrod/ansible-pre-commit.git
-    sha: 0fadd691465b97db8992cfc66650f630e433324b
+    sha: v0.5.0
     hooks:
     -   id: ansible-syntax-check
         always_run: true

.travis.yml

@@ -4,12 +4,12 @@ python: ["2.7", "3.5"]
 dist: trusty
 sudo: True
 group: beta
-services: [docker]
 env:
+    global:
+        - VBOX_MEMORY=2048
+    matrix:
         - platform: xenial
-      driver: vagrant
         - platform: trusty
-      driver: vagrant
 matrix:
     fast_finish: True
     allow_failures:
@@ -30,8 +30,9 @@ install:
 
 script:
   - pre-commit run --all-files
-  - travis_wait 45 molecule test --driver $driver --platform $platform
+  - travis_wait 45 molecule test --platform $platform
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
   email: false
+  on_failure: never

README.rst

@@ -29,9 +29,8 @@ See :code:`tests/playbook.yml`.
 Testing
 -------
 
-Testing requires Python 2.7 and either Docker or Vagrant and Virtualbox.
-Install the Python dependencies, dependent roles and roles required for
-testing:
+Testing requires Python 2.7, Vagrant and Virtualbox. Install the Python
+dependencies, dependent roles and roles required for testing:
 
 .. code:: shell
 

meta/main.yml

@@ -8,6 +8,7 @@ galaxy_info:
   - name: Ubuntu
     versions:
     - xenial
+    - trusty
   galaxy_tags: [ docker ]
 dependencies:
     - name: python27

molecule.yml

@@ -25,6 +25,7 @@ vagrant:
     options:
         append_platform_to_hostname: yes
   raw_config_args:
+  - 'vm.boot_timeout = 600'
   - 'vm.synced_folder ".", "/vagrant", disabled: true'
   - 'vbguest.auto_update = false if Vagrant.has_plugin?("vbguest")'
   - 'landrush.enabled = false if Vagrant.has_plugin?("landrush")'
@@ -32,4 +33,5 @@ vagrant:
   - |
       vm.provider "virtualbox" do |v|
         v.customize "pre-boot", ["modifyvm", :id, "--hwvirtex", "off"]
+        v.memory = ENV['VBOX_MEMORY'].to_i if ENV.has_key?('VBOX_MEMORY')
       end

tests/requirements.txt

 ansible==2.2.1.0
-testinfra==1.5.2
-molecule==1.19.0
+testinfra==1.5.3
+molecule==1.20.0
 ansible-lint==3.4.10
-pre-commit==0.11.0
+pre-commit==0.12.2
 piprot==0.9.7
 python-vagrant==0.5.14
-docker-py==1.10.6
 netaddr==0.7.19
-passlib==1.7.0
+passlib==1.7.1
 bcrypt==3.1.2