kitchen-ansible 0.45.3 → 0.45.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75997b6e4caaaa22941bf9be18132a8ee9b867b1
-  data.tar.gz: 3e15a2232e501dbc16befc1f046e7b20f48c4151
+  metadata.gz: e8c5380fe9e1ad20a849fa4160b1d74ca479d79e
+  data.tar.gz: 52240f3ae11fc57b9d6a2b3d44825a077c26fff3
 SHA512:
-  metadata.gz: c99618b97a7cff099b4f8614c9b93248cde0b2441d12aea6b1668efb4f3024c6a07e63a37d3fc2c2cc6c990a97827430f5ca780acf306247c1f3de846f517883
-  data.tar.gz: 91aade88a125d25fd149b7cab732bb436e661067c16fe5608f0103db2044eb35c0a8ca36368c4e60519783fb50feaef043e777a7af41f5c6bd6ea65ab229f383
+  metadata.gz: 0a316c4eb405e6e85d41b517a4f4e3f4a7a0581e43de45fd908ad9d1df85f668aaf0b3c724cb4b43b9c3fcb1151317659a539e2676b96ce8d0c8865b9567acc2
+  data.tar.gz: c468db5a389d23d56da76ee84d7791b656293958622b234b64c782f38a0a15f13fb42aae435625df3ad62f8a26f5ceb1b5b15fd59d5e2965b840224deefee22a

data/lib/kitchen-ansible/version.rb

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

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

@@ -75,6 +75,7 @@ module Kitchen
         default_config :ansible_limit, nil
         default_config :ignore_paths_from_root, []
         default_config :role_name, nil
+        default_config :additional_copy_role_path, false
 
         default_config :playbook do |provisioner|
           provisioner.calculate_path('default.yml', :file) ||

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -805,8 +805,10 @@ module Kitchen
       def ansible_roles_path
         roles_paths = []
         roles_paths << File.join(config[:root_path], 'roles') unless config[:roles_path].nil?
-        additional_files.each do |additional_file|
-          roles_paths << File.join(config[:root_path], File.basename(additional_file))
+        if config[:additional_copy_role_path]
+          additional_files.each do |additional_file|
+            roles_paths << File.join(config[:root_path], File.basename(additional_file))
+          end  
         end
         if roles_paths.empty?
           info('No roles have been set.')

data/provisioner_options.md

@@ -14,11 +14,11 @@ It installs it in the following order:
 
 * if require_pip is set to true
 
-  Install require packages and then installs ansible using the python pip command with ansible version if specified.
+  Install require packages and then installs ansible using the python pip command and ansible version must be specified. This allows a specific version of ansible to be installed.
 
 * if require_ansible_repo is set to true (the default)
 
-  Installs from the operation system repository with the ansible version that is in the particular repository and will use the ansible_version in the package name where appropriate.
+  Installs from the operation system repository only with the ansible version that is in the particular repository and will use the ansible_version in the package name where appropriate.
 
 # Provisioner Options
 
@@ -27,6 +27,7 @@ kitchen-ansible runs the ansible playbook command http://linux.die.net/man/1/ans
 key | default value | Notes
 ----|---------------|--------
 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
+additional_copy_role_path | false | additional_copy_path directories are appended to the ANSIBLE_ROLES_PATH env var when running ansible
 ansible_apt_repo | ppa:ansible/ansible | `apt` repo; see `https://launchpad.net` `/~ansible/+archive/ubuntu/ansible` or `rquillo/ansible`
 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`
 ansible_check | false | Sets the `--check` flag when running Ansible

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.45.3
+  version: 0.45.4
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen