kitchen-ansible 0.42.5 → 0.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22310b6be0bb7881bc893656c98957e5a4b59cdd
-  data.tar.gz: 7bf5d14f666d032b49876950c281c81009b7fb22
+  metadata.gz: 7af6d938b0b846fc446f5a7e9ab9fbc43547491e
+  data.tar.gz: 075abcd0d5ca3220e8a8394c17e6272eef9b928f
 SHA512:
-  metadata.gz: 0fb02c340e124f287c4f9792dc89c269fe3f143fa6b7ce33aced0bf745b49ebcc09aef1f9896f75eb0f5d8097f198fa702ae1b7454edc34966b8df503fb247ad
-  data.tar.gz: 6e790d92d417f31732a06d6fb60c904f5b39eaa3a21fcaead32c46ff57a65c23c2edc03d73d7ab5741a15f436101b62ebbad87a0b498de8ee5666c2378726796
+  metadata.gz: 9d24f83915e3e451171d49a013990ae88957b373ae0569ddf9d38a4eaf66e5b528fed6da91e0bcc04f29328fc423bf465e4d89e563a8a090eb3c86d40ed2806a
+  data.tar.gz: 89dc690449cdc55e55f50f4f6ed0aeff7cb54d2cc60825c8ec8bb9da8a94cfa637dd245da8d3376703aca480f34e07292648ef3b3a67c30ad3f08003f3d426d2

data/README.md

@@ -6,32 +6,32 @@
 
 A Test Kitchen Provisioner for Ansible.
 
-The provisioner works by passing the ansible repository based on attributes in `.kitchen.yml` & calling `ansible-playbook`.
+The provisioner works by passing the Ansible repository based on attributes in `.kitchen.yml` & calling `ansible-playbook`.
 
 It installs Ansible on the server and runs `ansible-playbook` using host localhost.
 
 It has been tested against the Ubuntu 12.04, Ubuntu 14.04, Centos 6.5 and Debian 6/7/8  boxes running in vagrant/virtualbox.
 
 ## Requirements
-- [test-kitchen](https://github.com/test-kitchen/test-kitchen)
-- a driver box without a chef installation so ansible can be installed.
+- [Test Kitchen](https://github.com/test-kitchen/test-kitchen).
+- a driver box without a Chef installation so Ansible can be installed.
 
 ## Installation & Setup
-Install the kitchen-ansible gem in your system, along with [kitchen-vagrant](https://github.com/test-kitchen/kitchen-vagrant) or some other suitable driver for test-kitchen:
+Install the `kitchen-ansible` gem in your system, along with [kitchen-vagrant](https://github.com/test-kitchen/kitchen-vagrant) or [kitchen-docker](https://github.com/test-kitchen/kitchen-docker) or any other suitable driver:
 
 ```
 gem install kitchen-ansible
 gem install kitchen-vagrant
 ```
 
-## Example kitchen.yml file
+## Example .kitchen.yml file
 
-Based on the example ansible setup for tomcat at https://github.com/ansible/ansible-examples/tree/master/tomcat-standalone
+Based on the [Tomcat Standalone](https://github.com/ansible/ansible-examples/tree/master/tomcat-standalone) example:
 
 ```yaml
 ---
 driver:
-    name: vagrant
+  name: vagrant
 
 provisioner:
   name: ansible_playbook
@@ -40,8 +40,6 @@ provisioner:
   require_ansible_repo: true
   ansible_verbose: true
   ansible_version: latest
-  extra_vars:
-    a: b
 
 platforms:
   - name: nocm_centos-6.5
@@ -51,41 +49,41 @@ platforms:
       box_url: http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
       network:
       - ['forwarded_port', {guest: 8080, host: 8080}]
-      - [ 'private_network', { ip: '192.168.33.11' } ]
+      - ['private_network', {ip: '192.168.33.11'}]
 ```
 
 ## Test-Kitchen Ansible Windows Support
 
-Windows is supported by creating a linux server to run ansible with software required to support winrm. Then the winrm connection is used to configure the windows server.
+Windows is supported by creating a linux server to run Ansible with software required to support winrm. Then the winrm connection is used to configure the windows server.
 
-In kitchen.yml set
+In `.kitchen.yml` set:
 
-```
+```yaml
   ansible_connection: winrm
   require_windows_support: true
   require_chef_for_busser: false
 ```
 
-See example [https://github.com/neillturner/ansible_windows_repo](https://github.com/neillturner/ansible_windows_repo).
+See the [Ansible Windows repo](https://github.com/neillturner/ansible_windows_repo) example.
 
 ## Using Roles from Ansible Galaxy 
 
-Roles can be used from the Ansible Galaxy using 2 methods: 
+Roles can be used from the Ansible Galaxy using two methods: 
 
-1. Specify a requirements.yml file in your ansible repository. For more details see: http://docs.ansible.com/ansible/galaxy.html 
+1. Specify a `requirements.yml` file in your Ansible repository. For more details see [here](http://docs.ansible.com/ansible/galaxy.html).
 
-2. Use librarian-ansible by creating an AnsibleFile in the top level of the repository and kitchen-puppet will automatically call librarian-ansible as part of the converge. For a description of setting up an AnsibleFile see:  https://werner-dijkerman.nl/2015/08/15/using-librarian-ansible-to-install-ansible-roles-from-gitlab/
+2. Use `librarian-ansible` by creating an `Ansiblefile` in the top level of the repository and `kitchen-ansible` will automatically call `librarian-ansible` during convergence. For a description of setting up an `Ansiblefile` see [here](https://werner-dijkerman.nl/2015/08/15/using-librarian-ansible-to-install-ansible-roles-from-gitlab/).
 
-## Ruby install to run serverspec verify
+## Ruby install to run Serverspec verify
 
-By default test-kitchen installs chef to get a ruby version suitable to run serverspec in the `verify` step.
-Instead ruby can just be installed by specifying the provisioner option:
+By default test-kitchen installs Chef to get a Ruby version suitable to run Serverspec in the `verify` step.
+Instead Ruby can just be installed by specifying the provisioner option:
 
-```
+```yaml
 require_ruby_for_busser: true
 ```
 And set the verifier section:
-```
+```yaml
 verifier:
   name: serverspec
   sudo_path: true
@@ -104,31 +102,29 @@ suites:
         LOGIN_USER: centos
         SUDO: true
         SSH_KEY: spec/test.pem
-
 ```
 
 Please see the [Provisioner Options](https://github.com/neillturner/kitchen-ansible/blob/master/provisioner_options.md) for a complete listing.
 
-
 ## Test-Kitchen Ansiblespec
 
 By using kitchen-verifier-serverspec and the Runner ansiblespec_runner tests can be run against multiple servers with multiple roles in the ansiblespec format.
 
-Serverspec uses ssh to communicate with the server to be tested and reads the ansible playbook and inventory files to determine the hosts to test and the roles for each host.
+Serverspec uses ssh to communicate with the server to be tested and reads the Ansible playbook and inventory files to determine the hosts to test and the roles for each host.
 
 See example [https://github.com/neillturner/ansible_repo](https://github.com/neillturner/ansible_repo)
 
-### Example usage to create tomcat servers:
+### Example usage to create Tomcat servers:
 
-![test-kitchen, ansible and ansiblespec](https://github.com/neillturner/ansible_repo/blob/master/kitchen-ansible.png "test-kitchen, ansible and ansiblespec")
+![test-kitchen, Ansible and ansiblespec](https://github.com/neillturner/ansible_repo/blob/master/kitchen-ansible.png "test-kitchen, ansible and ansiblespec")
 
-See [ansible-sample-tdd](https://github.com/volanja/ansible-sample-tdd)
+See [ansible-sample-tdd](https://github.com/volanja/ansible-sample-tdd).
 
 ### Usage
 
 #### Directory
 
-In the ansible repository specify:
+In the Ansible repository specify:
 
 * spec files with the roles.
 * spec_helper in the spec folder (with code as below).
@@ -162,7 +158,7 @@ In the ansible repository specify:
 
 #### spec_helper
 
-```
+```ruby
 require 'rubygems'
 require 'bundler/setup'
 
@@ -182,42 +178,36 @@ RSpec.configure do |config|
 end
 ```
 
-See [kitchen-verifier-serverspec](https://github.com/neillturner/kitchen-verifier-serverspec)
+See [kitchen-verifier-serverspec](https://github.com/neillturner/kitchen-verifier-serverspec).
 
 ## Alternative Virtualization/Cloud providers for Vagrant
 This could be adapted to use alternative virtualization/cloud providers such as Openstack/AWS/VMware Fusion according to whatever is supported by Vagrant.
 ```yaml
 platforms:
-    - name: ubuntu-12.04
-      driver_config:
-        provider: aws
-        box: my_base_box
-        # username is based on what is configured in your box/ami
-        username: ubuntu
-        customize:
-          access_key_id: "AKKJHG659868LHGLH"
-          secret_access_key: "G8t7o+6HLG876JGF/58"
-          ami: ami-7865ab765d
-          instance_type: t2.micro
-          # more customisation can go here, based on what the vagrant provider supports
-          #security-groups: []
+  - name: ubuntu-12.04
+    driver_config:
+      provider: aws
+      box: my_base_box
+      # username is based on what is configured in your box/ami
+      username: ubuntu
+      customize:
+        access_key_id: 'AKKJHG659868LHGLH'
+        secret_access_key: 'G8t7o+6HLG876JGF/58'
+        ami: ami-7865ab765d
+        instance_type: t2.micro
+        # more customisation can go here, based on what the vagrant provider supports
+        #security-groups: []
 ```
 
 ## Notes
 
-* The `default` in all of the above is the name of the test suite defined in the 'suites' section of your `.kitchen.yml`, so if you have more than suite of tests or change the name, you'll need to adapt the example accordingly.
-* serverspec test files *must* be named `_spec.rb`
-* Since I'm using Vagrant, my `box` definitions refer to Vagrant boxes, either standard, published boxes available from <http://atlas.hashicorp.com/boxes> or custom-created boxes (perhaps using [Packer][packer] and [bento][bento]), in which case you'll need to provide the url in `box_url`.
-
-[Serverspec]: http://serverspec.org
-[packer]: https://packer.io
-[bento]: https://github.com/chef/bento
-
+* The `default` in all of the above is the name of the test suite defined in the `suites` section of your `.kitchen.yml`, so if you have more than one suite of tests or change the name, you'll need to adapt the example accordingly.
+* Serverspec test files *must* be named `_spec.rb`
+* Since I'm using Vagrant, my `box` definitions refer to Vagrant boxes, either standard, published boxes available from [Atlas](http://atlas.hashicorp.com/boxes) or custom-created boxes (perhaps using [Packer](http://packer.io) and [bento](https://github.com/chef/bento), in which case you'll need to provide the URL in `box_url`.
 
 ## Tips
 
-You can easily skip previous instructions and jump directly to the broken statement you just fixed by passing
-an environment variable. Add the following to your `.kitchen.yml`:
+You can easily skip previous instructions and jump directly to the broken statement you just fixed by passing an environment variable. Add the following to your `.kitchen.yml`:
 
 ```yaml
 provisioner:
@@ -227,6 +217,8 @@ provisioner:
 
 Then run:
 
-`ANSIBLE_EXTRA_FLAGS='--start-at-task="myrole | name of last working instruction"' kitchen converge`
+```
+$ ANSIBLE_EXTRA_FLAGS='--start-at-task="myrole | name of last working instruction"' kitchen converge
+```
 
 You save a lot of time not running working instructions.

data/lib/kitchen-ansible/version.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 module Kitchen
   module Ansible
-    VERSION = '0.42.5'
+    VERSION = '0.43.0'
   end
 end

data/lib/kitchen/provisioner/ansible/config.rb

@@ -45,7 +45,8 @@ module Kitchen
         default_config :ansible_sles_repo, 'http://download.opensuse.org/repositories/systemsmanagement/SLE_12/systemsmanagement.repo'
         default_config :python_sles_repo, 'http://download.opensuse.org/repositories/devel:/languages:/python/SLE_12/devel:languages:python.repo'
         default_config :chef_bootstrap_url, 'https://www.getchef.com/chef/install.sh'
-        # Until we can truly make busser work without /opt/chef/embedded/bin/gem being installed, we still need Chef Omnibus
+        # Providing we have Ruby >= 2.0 we only need Ruby. Leaving default to install Chef Omnibus for backwards compatibility.
+        # Note: if using kitchen-verifer-serverspec your we can avoid needing Ruby too.
         # (Reference: https://github.com/neillturner/kitchen-ansible/issues/66 )
         default_config :require_chef_for_busser, true
         default_config :require_ruby_for_busser, false

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -72,6 +72,9 @@ module Kitchen
         elsif config[:require_ansible_source]
           info('Installing ansible from source')
           cmd = install_ansible_from_source_command
+        elsif config[:require_pip]
+          info('Installing ansible through pip')
+          cmd = install_ansible_from_pip_command
         elsif config[:require_ansible_repo]
           if !@os.nil?
             info("Installing ansible on #{@os.name}")
@@ -99,7 +102,7 @@ module Kitchen
           return
         end
         result = cmd + install_windows_support + install_busser_prereqs
-        info("Going to install ansible with: #{result}")
+        debug("Going to install ansible with: #{result}")
         result
       end
 
@@ -334,14 +337,13 @@ module Kitchen
           return config[:ansible_playbook_command]
         else
 
-          cmd = ansible_command('ansible-playbook')
-          if config[:require_ansible_source]
+          if config[:require_ansible_source] && !config[:ansible_binary_path]
             # this is an ugly hack to get around the fact that extra vars uses ' and "
-            cmd = ansible_command("PATH=#{config[:root_path]}/ansible/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games PYTHONPATH=#{config[:root_path]}/ansible/lib MANPATH=#{config[:root_path]}/ansible/docs/man #{config[:root_path]}/ansible/bin/ansible-playbook")
-          end
-
-          if config[:ansible_binary_path]
+            cmd = ansible_command("PATH=#{config[:root_path]}/ansible/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games PYTHONPATH=#{config[:root_path]}/ansible/lib MANPATH=#{config[:root_path]}/ansible/docs/man ansible-playbook")
+          elsif config[:ansible_binary_path]
             cmd = ansible_command("#{config[:ansible_binary_path]}/ansible-playbook")
+          else
+            cmd = ansible_command('ansible-playbook')
           end
 
           cmd = "HTTPS_PROXY=#{https_proxy} #{cmd}" if https_proxy
@@ -369,7 +371,7 @@ module Kitchen
             ansible_extra_flags,
             "#{File.join(config[:root_path], File.basename(config[:playbook]))}"
           ].join(' ')
-          info("Going to invoke ansible-playbook with: #{result}")
+          debug("Going to invoke ansible-playbook with: #{result}")
           if config[:idempotency_test]
             result = "#{result} && (echo 'Going to invoke ansible-playbook second time:'; #{result} | tee /tmp/idempotency_test.txt; grep -q 'changed=0.*failed=0' /tmp/idempotency_test.txt && (echo 'Idempotence test: PASS' && exit 0) || (echo 'Idempotence test: FAIL' && exit 1))"
             debug("Full cmd with idempotency test: #{result}")
@@ -423,15 +425,15 @@ module Kitchen
           if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ]; then
             #{Kitchen::Provisioner::Ansible::Os::Redhat.new('redhat', config).install_epel_repo}
             #{update_packages_redhat_cmd}
-            #{sudo_env('yum')} -y install libselinux-python python2-devel git python-setuptools python-setuptools-dev
+            #{sudo_env('yum')} -y install libselinux-python python2-devel git python-setuptools python-setuptools-dev libffi-devel libssl-devel
           else
             if [ -f /etc/SUSE-brand ] || [ -f /etc/SuSE-release ]; then
               #{sudo_env('zypper')} ar #{python_sles_repo}
               #{update_packages_suse_cmd}
-              #{sudo_env('zypper')} --non-interactive install python python-devel git python-setuptools python-pip python-six libyaml-devel
+              #{sudo_env('zypper')} --non-interactive install python python-devel git python-setuptools python-pip python-six libyaml-devel libffi-devel libopenssl-devel
             else
               #{update_packages_debian_cmd}
-              #{sudo_env('apt-get')} -y install git python python-setuptools build-essential python-dev
+              #{sudo_env('apt-get')} -y install git python python-setuptools build-essential python-dev libffi-dev libssl-dev
             fi
           fi
 
@@ -443,6 +445,34 @@ module Kitchen
         INSTALL
       end
 
+      def install_ansible_from_pip_command
+        ansible_version = ''
+        ansible_version = "==#{config[:ansible_version]}" unless config[:ansible_version] == 'latest'
+
+        <<-INSTALL
+        if [ ! -d #{config[:root_path]}/ansible ]; then
+          if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ]; then
+            #{Kitchen::Provisioner::Ansible::Os::Redhat.new('redhat', config).install_epel_repo}
+            #{update_packages_redhat_cmd}
+            #{sudo_env('yum')} -y install libselinux-python python2-devel git python-setuptools python-setuptools-dev libffi-devel libssl-devel
+          else
+            if [ -f /etc/SUSE-brand ] || [ -f /etc/SuSE-release ]; then
+              #{sudo_env('zypper')} ar #{python_sles_repo}
+              #{update_packages_suse_cmd}
+              #{sudo_env('zypper')} --non-interactive install python python-devel git python-setuptools python-pip python-six libyaml-devel libffi-devel libopenssl-devel
+            else
+              #{update_packages_debian_cmd}
+              #{sudo_env('apt-get')} -y install git python python-setuptools build-essential python-dev libffi-dev libssl-dev
+            fi
+          fi
+
+          #{export_http_proxy}
+          #{sudo_env('easy_install')} pip
+          #{sudo_env('pip')} install ansible#{ansible_version}
+        fi
+        INSTALL
+      end
+
       def install_omnibus_command
         info('Installing ansible using ansible omnibus')
 

data/provisioner_options.md

@@ -3,130 +3,96 @@
 
 key | default value | Notes
 ----|---------------|--------
-ansible_version | "latest"| desired version, affects apt installs
-ansible_sudo | true | drives whether ansible-playbook is executed as root or as the current authenticated user
-sudo_command | sudo -E | sudo command change to 'sudo -E -H' to be consistent with ansible
-ansible_platform | naively tries to determine | OS platform of server
-require_ansible_repo | true | Set if using a ansible install from yum or apt repo
-ansible_apt_repo | "ppa:ansible/ansible" | apt repo. see https://launchpad.net /~ansible/+archive/ubuntu/ansible or rquillo/ansible
-ansible_yum_repo | nil | yum repo RH/Centos6
-ansible_binary_path | NULL | If specified this will override the location where kitchen tries to run ansible-playbook from. ie: (ansible_binary_path: /usr/local/bin )
-enable_yum_epel  | false | enable yum EPEL repo
-ansible_sles_repo | http://download.opensuse.org/repositories /systemsmanagement/SLE_12 /systemsmanagement.repo | zypper suse ansible repo
-python_sles_repo | http://download.opensuse.org/repositories /devel:/languages:/python/SLE_12 /devel:languages:python.repo | zypper suse python repo
-require_ansible_omnibus | false | Set if using omnibus ansible pip install
-ansible_omnibus_url | https://raw.githubusercontent.com /neillturner/omnibus-ansible /master/ansible_install.sh | omnibus ansible install location.
-ansible_omnibus_remote_path | "/opt/ansible" | Server Installation location of an omnibus ansible install.
-http_proxy | nil | use http proxy when installing Ansible, packages and running Ansible
-https_proxy | nil | use https proxy when installing Ansible, packages and running Ansible
-no_proxy | nil | list of URLs or IPs that should be excluded from proxying
-roles_path | roles | ansible repo roles directory
-group_vars_path | group_vars | ansible repo group_vars directory
-host_vars_path | host_vars | ansible repo hosts directory
-library_plugins_path | library | ansible repo library plugins directory
-callback_plugins_path | callback_plugins | ansible repo callback_plugins directory
-filter_plugins_path | filter_plugins | ansible repo filter_plugins directory
-lookup_plugins_path | lookup_plugins | ansible repo lookup_plugins directory
-additional_copy_path | | arbitrary array of files and directories to copy into test environment, relative to CWD. (eg, vars or included playbooks)
-extra_vars | Hash.new | Hash to set the extra_vars passed to ansibile-playbook command
-playbook | 'default.yml' | playbook for ansible-playbook to run
-modules_path | | ansible repo manifests directory
-ansible_verbose| false| Extra information logging
-ansible_verbosity| 1| Sets the verbosity flag appropriately (e.g.: `1 => '-v', 2 => '-vv', 3 => '-vvv" ...`) Valid values are one of: `1, 2, 3, 4` OR `:info, :warn, :debug, :trace`.
-ansible_check| false| Sets the `--check` flag when running Ansible
-ansible_diff| false| Sets the `--diff` flag when running Ansible
-update_package_repos| true| update OS repository metadata
+ansible_version | latest | Desired version, only affects `apt-get` installs
+ansible_sudo | true | Determines whether `ansible-playbook` is executed as root or as the current authenticated user
+sudo_command | sudo -E | `sudo` command; change to `sudo -E -H` to be consistent with Ansible
+ansible_platform | Naively tries to determine | OS platform of server
+require_ansible_repo | true | Set if installing Ansible from a `yum` or `apt` repo
+ansible_apt_repo | ppa:ansible/ansible | `apt` repo; see `https://launchpad.net` `/~ansible/+archive/ubuntu/ansible` or `rquillo/ansible`
+ansible_yum_repo | nil | `yum` repo for EL platforms
+ansible_binary_path | NULL | If specified this will override the location where `kitchen` tries to run `ansible-playbook` from, i.e. `ansible_binary_path: /usr/local/bin`
+enable_yum_epel | false | Enable the `yum` EPEL repo
+ansible_sles_repo | `http://download.opensuse.org/repositories` `/systemsmanagement/SLE_12` `/systemsmanagement.repo` | Zypper SuSE Ansible repo
+python_sles_repo | `http://download.opensuse.org/repositories` `/devel:/languages:/python/SLE_12` `/devel:languages:python.repo` | Zypper SuSE python repo
+require_ansible_omnibus | false | Set to `true` if using Omnibus Ansible `pip` install
+require_pip | false | Set to `true` if Ansible is to be installed through `pip`).
+ansible_omnibus_url | `https://raw.githubusercontent.com` `/neillturner/omnibus-ansible` `/master/ansible_install.sh` | Omnibus Ansible install location
+ansible_omnibus_remote_path | /opt/ansible | Server installation location of an Omnibus Ansible install
+http_proxy | nil | Use HTTP proxy when installing Ansible, packages and running Ansible
+https_proxy | nil | Use HTTPS proxy when installing Ansible, packages and running Ansible
+no_proxy | nil | List of URLs or IPs that should be excluded from proxying
+roles_path | roles | Ansible repo roles directory
+group_vars_path | group_vars | Ansible repo group_vars directory
+host_vars_path | host_vars | Ansible repo hosts directory
+library_plugins_path | library | Ansible repo library plugins directory
+callback_plugins_path | callback_plugins | Ansible repo `callback_plugins` directory
+filter_plugins_path | filter_plugins | Ansible repo `filter_plugins` directory
+lookup_plugins_path | lookup_plugins | Ansible repo `lookup_plugins` directory
+additional_copy_path | | Arbitrary array of files and directories to copy into test environment, relative to the current dir, e.g. vars or included playbooks
+extra_vars | Hash.new | Hash to set the `extra_vars` passed to `ansible-playbook` command
+playbook | default.yml | Playbook for `ansible-playbook` to run
+modules_path | | Ansible repo manifests directory
+ansible_verbose | false | Extra information logging
+ansible_verbosity | 1 | Sets the verbosity flag appropriately, e.g.: `1 => '-v', 2 => '-vv', 3 => '-vvv' ...`. Valid values are: `1, 2, 3, 4` or `:info, :warn, :debug, :trace`
+ansible_check | false | Sets the `--check` flag when running Ansible
+ansible_diff | false | Sets the `--diff` flag when running Ansible
+update_package_repos | true | Update OS repository metadata
 ansiblefile_path | | Path to Ansiblefile
-requirements_path | | Path to ansible-galaxy requirements
-ansible_vault_password_file| | Path of Ansible Vault Password File
-ansible_connection | local | use 'ssh' if host not localhost or 'winrm' for windows or 'none' if defined in inventory.
-hosts |  | create ansible hosts file for localhost with this server group
-ansible_inventory |  | Static or dynamic inventory file or directory or 'none' if defined in ansible.cfg.
-ansible_limit |  | Further limits the selected host/group patterns.
-ansible_extra_flags |  | Additional options to pass to `ansible-playbook` -- e.g.: `'--skip-tags=redis'`
-ansible_playbook_command | | Override the ansible playbook command
-require_ruby_for_busser|false|install ruby to run busser for tests
-require_chef_for_busser|true|install chef to run busser for tests. NOTE: kitchen 1.4 only requires ruby to run busser so this is not required.
-chef_bootstrap_url |https://www.getchef.com /chef/install.sh| the chef install
-require_ansible_source | false | Install Ansible from source using method described here: http://docs.ansible.com/ intro_installation.html#running-from-source. Only works on Debian/Ubuntu at present.
-ansible_source_rev | | Branch or Tag to install ansible source
-ansible_host_key_checking | true | strict host key checking in ssh
+requirements_path | | Path to Ansible Galaxy requirements
+ansible_vault_password_file | | Path to Ansible Vault password file
+ansible_connection | local | use `ssh` if the host is not `localhost` (Linux) or `winrm` (Windows) or `none` if defined in inventory
+hosts |  | Create Ansible hosts file for localhost with this server group
+ansible_inventory |  | Static or dynamic inventory file or directory or none if defined in `ansible.cfg`
+ansible_limit |  | Further limits the selected host/group patterns
+ansible_extra_flags |  | Additional options to pass to ansible-playbook, e.g. `'--skip-tags=redis'`
+ansible_playbook_command | | Override the Ansible playbook command
+require_ruby_for_busser | false | Install Ruby to run Busser for tests
+require_chef_for_busser | true | Install Chef to run Busser for tests. NOTE: kitchen 1.4 only requires Ruby to run Busser so this is not required.
+chef_bootstrap_url | `https://www.getchef.com/chef/install.sh` | The Chef install
+require_ansible_source | false | Install Ansible from source using method described [here](http://docs.ansible.com/intro_installation.html#running-from-source). Only works on Debian/Ubuntu at present
+ansible_source_rev | | Branch or tag to install Ansible source
+ansible_host_key_checking | true | Strict host key checking in ssh
 private_key | | ssh private key file for ssh connection
-idempotency_test | false | Enable to test ansible playbook idempotency
-ssh_known_hosts | | List of hosts that should be added to `~/.ssh/known_hosts`
-kerberos_conf_file| | Path of krb5.conf file using in windows support
-require_windows_support | false | install windows support: http://docs.ansible.com/ansible/intro_windows.html
+idempotency_test | false | Enable to test Ansible playbook idempotency
+ssh_known_hosts | | List of hosts that should be added to ~/.ssh/known_hosts
+kerberos_conf_file | | Path of krb5.conf file using in Windows support
+require_windows_support | false | Install [Windows support](http://docs.ansible.com/ansible/intro_windows.html)
 
 ## Configuring Provisioner Options
 
 The provisioner can be configured globally or per suite, global settings act as defaults for all suites, you can then customise per suite, for example:
 
 ```yaml
-    ---
-    driver:
-        name: vagrant
-
-    provisioner:
-      name: ansible_playbook
-      roles_path: roles
-      hosts: tomcat-servers
-      require_ansible_repo: true
-      ansible_verbose: true
-      ansible_verbosity: 2
-      ansible_diff: true
-
-    platforms:
-    - name: nocm_ubuntu-12.04
-      driver_plugin: vagrant
-      driver_config:
-        box: nocm_ubuntu-12.04
-        box_url: http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
-
-    suites:
-     - name: default
-```
-
-## Ruby install to run serverspec verify
-
-By default test-kitchen installs chef to get a ruby version sutable for run serverspec in the Verify step.
-
-Instead ruby can just be installed by specifing the provisioner option:
-```
-require_ruby_for_busser false
-```
-And set the verifer section:
-```
-verifier:
-  name: Busser
-  plugin:
-  - Ansiblespec
-  ruby_bindir: '/usr/bin'
-```
-and create a Gemfile to add additionl ruby gems in directory test/integration/default/ansiblespec
-```
-source 'https://rubygems.org'
-
-gem 'rake'
-```
-
-in this example, vagrant will download a box for ubuntu 1204 with no configuration management installed, then install the latest ansible and ansible playbook against a ansible repo from the /repository/ansible_repo directory using the default manifest site.yml
-
-To override a setting at the suite-level, specify the setting name under the suite's attributes:
-
-```yaml
-    suites:
-     - name: server
-       attributes:
-         extra_vars:
-           server_installer_url: http://downloads.app.com/v1.0
-         tags:
-           - server
+---
+driver:
+  name: vagrant
+
+provisioner:
+  name: ansible_playbook
+  roles_path: roles
+  hosts: tomcat-servers
+  require_ansible_repo: true
+  ansible_verbose: true
+  ansible_verbosity: 2
+  ansible_diff: true
+
+platforms:
+- name: nocm_ubuntu-12.04
+  driver_plugin: vagrant
+  driver_config:
+    box: nocm_ubuntu-12.04
+    box_url: http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
+
+suites:
+ - name: default
 ```
 
 ### Per-suite Structure
 
 It can be beneficial to keep different Ansible layouts for different suites. Rather than having to specify the roles, modules, etc for each suite, you can create the following directory structure and they will automatically be found:
 
-    $kitchen_root/ansible/$suite_name/roles
-    $kitchen_root/ansible/$suite_name/modules
-    $kitchen_root/ansible/$suite_name/Ansiblefile
+```
+$kitchen_root/ansible/$suite_name/roles
+$kitchen_root/ansible/$suite_name/modules
+$kitchen_root/ansible/$suite_name/Ansiblefile
+```

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.42.5
+  version: 0.43.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen