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

# Conflicts:
#	.travis.yml

.travis.yml

@@ -5,23 +5,24 @@ dist: trusty
 sudo: True
 group: beta
 env:
+    global:
+        - VBOX_MEMORY=2048
+    matrix:
         - platform: openbsd60
         - &openbsd59 platform=openbsd59
         - &openbsd56 platform=openbsd56
         - platform: xenial
         - platform: trusty
-    - &jessie platform=jessie
-    - &wheezy platform=wheezy
         - platform: precise
         - &stretch platform=stretch
+        - platform: jessie
+        - platform: wheezy
 matrix:
     fast_finish: True
     allow_failures:
         - python: "3.5"
         - env: *openbsd59
         - env: *openbsd56
-        - env: *jessie
-        - env: *wheezy
         - env: *stretch
 cache:
   - pip
@@ -39,7 +40,7 @@ install:
 
 script:
   - pre-commit run --all-files
-  - molecule test --platform $platform
+  - travis_wait 45 molecule test --platform $platform
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/

molecule.yml

@@ -47,4 +47,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