kitchen-ansible 0.48.8 → 0.49.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1822afe6f27acf0e49e21e0670bace5f1ad2f8fa066a02fb913535e2e724b69
-  data.tar.gz: 68615a806e21f1cd6cef63f5c76c7e57be817b11fe2af891574dafbb6a1b5a66
+  metadata.gz: 8a3a081e05d3e114eee73aabc00ba27a7a23d5811ae2a7fec5795dd9caeaeff4
+  data.tar.gz: 7de303e363b104022de49f799bf289d9c834df47843430e15c48fc2dfac02e45
 SHA512:
-  metadata.gz: ecc81888a305d5890da42b7513d286e30ec831f9fe8304fd4b59729b7f89eb0701d83b7028435f5d94f605587ce7eb4e82f70e5235079a2a4f086aa891efec36
-  data.tar.gz: 4678e8b351f23aec08336e26a1cca67a6df4735c56531c26488e90d2abbe0e740d372ee2c42aa643d045b1e9d6d196e30dded560f62366b888ab52e30b570955
+  metadata.gz: fbba53a30ad0afbde098f019544777e94a0a323bfa04a33612671a623f26cd137c180c7bbe6b4acd929ee3cb4c7d1daa15b866f1bc87a2bbdad92172e8954155
+  data.tar.gz: f764da95bd4668f28ef81d57e240ad60181cf9c14ca0006af737d5b90f35deb77ee7dfd0ad4cb6b7dcf1584cf74dfe36eb1b79dfce6936cd6a1c6b2b4f769a38

data/lib/kitchen-ansible/version.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 module Kitchen
   module Ansible
-    VERSION = '0.48.8'.freeze
+    VERSION = '0.49.0'.freeze
   end
 end

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

@@ -90,6 +90,7 @@ module Kitchen
         default_config :show_command_output, false
         default_config :ignore_ansible_cfg, false
         default_config :galaxy_ignore_certs, false
+        default_config :keep_playbook_path, false
 
         default_config :playbook do |provisioner|
           provisioner.calculate_path('default.yml', :file) ||

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -422,7 +422,7 @@ module Kitchen
             extra_vars_file,
             tags(idempotence),
             ansible_extra_flags,
-            "#{File.join(config[:root_path], File.basename(config[:playbook]))}"
+            playbook_remote_path
           ].join(' ')
         end
         result = _run(cmd)
@@ -573,7 +573,8 @@ module Kitchen
       end
 
       def tmp_playbook_path
-        File.join(sandbox_path, File.basename(playbook))
+        return File.join(sandbox_path, playbook).to_s if config[:keep_playbook_path]
+        File.join(sandbox_path, File.basename(playbook)).to_s
       end
 
       def tmp_host_vars_dir
@@ -637,6 +638,11 @@ module Kitchen
         config[:playbook]
       end
 
+      def playbook_remote_path
+        return File.join(config[:root_path], config[:playbook]).to_s if config[:keep_playbook_path]
+        File.join(config[:root_path], File.basename(config[:playbook])).to_s
+      end
+
       def hosts
         config[:hosts]
       end
@@ -1034,6 +1040,7 @@ module Kitchen
       def prepare_playbook
         info('Preparing playbook')
         debug("Copying playbook from #{playbook} to #{tmp_playbook_path}")
+        FileUtils.mkdir_p(File.dirname(tmp_playbook_path)) if config[:keep_playbook_path]
         FileUtils.cp_r(playbook, tmp_playbook_path)
       end
 

data/provisioner_options.md

@@ -79,6 +79,7 @@ idempotency_skip_tags | [] | Adds a `--skip-tags` parameter with the specified t
 ignore_extensions_from_root | ['.pyc'] | allow extensions to be ignored when copying from roles using additional_copy_role_path or doing recursive_additional_copy_path
 ignore_paths_from_root | [] | allow extra paths to be ignored when copying from roles using additional_copy_role_path or using recursive_additional_copy_path
 kerberos_conf_file | | Path of krb5.conf file using in Windows support
+keep_playbook_path | false | Keep directory structure of `playbook`, e.g. when including vars with relativ paths from playbook
 library_plugins_path | library | Ansible repo library plugins directory
 lookup_plugins_path | lookup_plugins | Ansible repo `lookup_plugins` directory
 max_retries | 1 | maximum number of retry attempts of converge command

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.48.8
+  version: 0.49.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-09 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec