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

# Conflicts:
#	meta/main.yml

.travis.yml

@@ -7,6 +7,7 @@ group: beta
 env:
     global:
         - VBOX_MEMORY=2048
+        - VBOX_HWVIRTEX=off
     matrix:
         - TOXENV=pre-commit
         - TOXENV=openbsd60

meta/main.yml

@@ -3,7 +3,7 @@ galaxy_info:
   description: Provision PHP FastCGI (FPM)
   company: Shore technologies
   license: MIT
-  min_ansible_version: 2.0
+  min_ansible_version: 2.3
   platforms:
   - name: OpenBSD
     versions:

molecule.yml

@@ -42,6 +42,6 @@ vagrant:
   - 'landrush_ip.override = false if Vagrant.has_plugin?("landrush")'
   - |
       vm.provider "virtualbox" do |v|
-        v.customize "pre-boot", ["modifyvm", :id, "--hwvirtex", "off"]
+        v.customize "pre-boot", ["modifyvm", :id, "--hwvirtex", ENV['VBOX_HWVIRTEX']] if ENV.has_key?('VBOX_HWVIRTEX')
         v.memory = ENV['VBOX_MEMORY'].to_i if ENV.has_key?('VBOX_MEMORY')
       end

tasks/main.yml

@@ -11,7 +11,7 @@
         - ansible_os_family in php_fpm_validate_config
         - ansible_os_family in php_fpm_pools_dir
         - ansible_os_family in php_fpm_user
-        - ansible_distribution_release in ['jessie', 'trusty'] or ansible_distribution_version in ['6.0']
+        - ansible_distribution_release in ['precise', 'wheezy', 'jessie', 'trusty'] or ansible_distribution_version in ['6.0']
         - ansible_os_family != 'OpenBSD' or ansible_distribution_release in php_fpm_pkg_version
         - php_fpm_global_config is iterable
         - php_fpm_www_pool_config is iterable

tests/requirements.txt

 ansible==2.3.0.0
 testinfra==1.5.5
-molecule==1.23.2
+molecule==1.24.0
 ansible-lint==3.4.12
 python-vagrant==0.5.14
 netaddr==0.7.19

tox.ini

 [tox]
 skip_install = True
 skipsdist = True
-envlist = openbsd60,xenial,trusty,precise,stretch,jessie,wheezy
+envlist = openbsd60,trusty,precise,jessie,wheezy
 
 [testenv]
-envdir = {toxinidir}/.tox
+envdir = {toxinidir}/.tox/molecule
 deps = -rtests/requirements.txt
 passenv = HOME VBOX* ANSIBLE_*
 whitelist_externals =
@@ -14,7 +14,6 @@ commands =
     molecule test --platform {envname}
 
 [testenv:pre-commit]
-envdir = {toxinidir}/.tox
 deps =
     -rtests/requirements.txt
     pre-commit