kitchen-ansible 0.48.0 → 0.48.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3000b4a33dd946e4d64314ffad1c930373e1217f
-  data.tar.gz: 9f819154af5b31230a5a086072b3d7a80d8846ad
+  metadata.gz: 32dc95faa58ee424c8b2df63d2d5ab36ef98193a
+  data.tar.gz: a3a9d816d8b8e3cfe35b583865f1dd1213adad8c
 SHA512:
-  metadata.gz: 5b51e9f86170bb3e3eeb0522e27381b8335a851666243267fee6cbe72154bb5829d3ea7fb7d0522d80004bee8e18528c4711b666364f4093e4caca1b236439a1
-  data.tar.gz: 4fdec37b3da4fd7db358800bcaf31bb0af5817865ace15e476e950cc6b811db714c4b8bbbe59912fb6402160e9618ad29d8dfdf2c7a6a43b4a6194a4638074ae
+  metadata.gz: 30defbb48539f3b7581d554567a3dccfc703978f8aff7643326a2553d612be5a825e74ae468e277eb51130754b18ddc6d790779015b7ba1f3a537133025e8519
+  data.tar.gz: d61220f1fef0af00d92d464774cf7f5e310a9978144ac265d012bb5ec7d9fb06ec1a4d2997e42ae4375ac9d9bfebed0797d4d1ace1933397bebd081a85f47c27

data/lib/kitchen-ansible/version.rb

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

data/lib/kitchen/provisioner/ansible/os/debian.rb

@@ -41,7 +41,8 @@ module Kitchen
               #{update_packages_command}
 
               ## Install apt-utils to silence debconf warning: http://serverfault.com/q/358943/77156
-              #{sudo_env('apt-get')} -y install apt-utils git
+              ## Install dirmngr to handle GPG key management for stretch, addressing https://github.com/neillturner/kitchen-ansible/issues/257
+              #{sudo_env('apt-get')} -y install apt-utils git dirmngr
 
               ## Fix debconf tty warning messages
               export DEBIAN_FRONTEND=noninteractive

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -343,7 +343,7 @@ module Kitchen
         if ansible_inventory
           if File.directory?(ansible_inventory)
             Dir.foreach(ansible_inventory) do |f|
-              next if f == "." or f == ".."
+              next if File.directory?("#{ansible_inventory}/#{f}")
               contents = File.open("#{ansible_inventory}/#{f}", 'rb') { |g| g.read }
               if contents.start_with?('#!')
                 commands << [
@@ -598,8 +598,8 @@ module Kitchen
         File.join(sandbox_path, 'ssh_private_keys')
       end
 
-      def tmp_ansible_vault_password_file_path
-        File.join(sandbox_path, File.basename(ansible_vault_password_file).reverse.chomp('.').reverse)
+      def tmp_ansible_vault_password_file_path(f)
+        File.join(sandbox_path, File.basename(f).reverse.chomp('.').reverse)
       end
 
       def tmp_kerberos_conf_file_path
@@ -690,7 +690,11 @@ module Kitchen
       end
 
       def ansible_vault_password_file
-        config[:ansible_vault_password_file]
+        password_files = []
+        if config[:ansible_vault_password_file]
+          password_files = config[:ansible_vault_password_file].is_a?(Array) ? config[:ansible_vault_password_file] : [config[:ansible_vault_password_file]]
+        end
+        password_files.map(&:to_s)
       end
 
       def ansible_inventory
@@ -726,7 +730,15 @@ module Kitchen
 
       def ansible_vault_flag
         debug(config[:ansible_vault_password_file])
-        config[:ansible_vault_password_file] ? "--vault-password-file=#{File.join(config[:root_path], File.basename(config[:ansible_vault_password_file]).reverse.chomp('.').reverse)}" : nil
+        return nil if not ansible_vault_password_file
+
+        files = []
+
+        ansible_vault_password_file.each do |f|
+          files << "--vault-password-file=#{File.join(config[:root_path], File.basename(f).reverse.chomp('.').reverse)}"
+        end
+
+        files.join(' ')
       end
 
       def ansible_inventory_flag
@@ -1169,9 +1181,11 @@ module Kitchen
         return unless ansible_vault_password_file
 
         info('Preparing ansible vault password')
-        debug("Copying ansible vault password file from #{ansible_vault_password_file} to #{tmp_ansible_vault_password_file_path}")
+        ansible_vault_password_file.each do |f|
+          debug("Copying ansible vault password file from #{f} to #{tmp_ansible_vault_password_file_path(f)}")
 
-        FileUtils.cp(File.expand_path(ansible_vault_password_file), tmp_ansible_vault_password_file_path)
+          FileUtils.cp(File.expand_path(f), tmp_ansible_vault_password_file_path(f))
+        end
       end
 
       def prepare_kerberos_conf_file

data/provisioner_options.md

@@ -50,7 +50,7 @@ ansible_sles_repo | `http://download.opensuse.org/repositories` `/systemsmanagem
 ansible_source_url | `git://github.com/ansible/ansible.git` | Git URL of Ansible source
 ansible_source_rev | | Branch or tag to install Ansible source
 ansible_sudo | true | Determines whether `ansible-playbook` is executed as root or as the current authenticated user
-ansible_vault_password_file | | Path to Ansible Vault password file
+ansible_vault_password_file | | Path to Ansible Vault password file. Can also be an array of files.
 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_version | latest | Desired version, only affects `apt-get` installs

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.48.0
+  version: 0.48.1
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2017-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec