kitchen-ansible 0.46.2 → 0.46.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dad0c5408b74ee63fe4f3d76afb69c7f8414c81b
-  data.tar.gz: bdfed4e6a33261f5c4853b2a4e60a701a4a053ad
+  metadata.gz: 8ff6c857b37974cb25f27ac23756bff7f69e8c0f
+  data.tar.gz: 3f5458a86db9f1662dc996be3e1951ba250e0b29
 SHA512:
-  metadata.gz: 2575f39bf8ff7ebb5e222228f77fbc8c600a0d9ff72fed5e404dff36c0f700a8f411140be44a9e22fcc1398c5da6fe0458617936d3734dd2f2007a83465311b1
-  data.tar.gz: cf6e02fe5d6aa5da76c7f4e6453542393187d27bf44b8ceaa21c733a8f8493c22520068996bdccc7dfe81b446b3d40eca2b51ae72f5cb8c212a3552d48da67c2
+  metadata.gz: c3886fdab9de7d81ec0263e5cc8fe421208907fcd5f5f74d375b076645ee774e49921e85d2179a119d13a8260e9cec63d968831d842f13dd589fcdbe9b49e93a
+  data.tar.gz: 557df5fea59f9191593cbe76f02162ea3f50c7090eaf75c4a0021440c31c8a011d7735f24330b6e16086e2fbb9a928498ee9be01343ba152afb79b5f4745c4c7

data/README.md

@@ -51,6 +51,8 @@ provisioner:
   ansible_verbose: true
   ansible_version: latest
   require_chef_for_busser: false
+  additional_ssh_private_keys:
+  - /mykey/id_rsa
 
 platforms:
   - name: nocm_centos-6.5

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

@@ -56,6 +56,7 @@ module Kitchen
         default_config :require_pip, false
         default_config :requirements_path, false
         default_config :ssh_known_hosts, nil
+        default_config :additional_ssh_private_keys, nil
         default_config :ansible_verbose, false
         default_config :ansible_verbosity, 1
         default_config :ansible_check, false

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -279,6 +279,7 @@ module Kitchen
         prepare_lookup_plugins
         prepare_ansible_vault_password_file
         prepare_kerberos_conf_file
+        prepare_additional_ssh_private_keys
         info('Finished Preparing files for transfer')
       end
 
@@ -320,6 +321,12 @@ module Kitchen
           end
         end
 
+        if config[:additional_ssh_private_keys]
+          commands << [
+            sudo_env('cp -r'), File.join(config[:root_path], 'ssh_private_keys'), '~/.ssh'
+          ].join(' ')
+        end
+
         if ansible_inventory
           if File.directory?(ansible_inventory)
             Dir.foreach(ansible_inventory) do |f|
@@ -355,6 +362,7 @@ module Kitchen
         end
 
         command = commands.join(' && ')
+        debug("*** COMMAND TO RUN:")
         debug(command)
         command
       end
@@ -571,6 +579,10 @@ module Kitchen
         File.join(sandbox_path, 'lookup_plugins')
       end
 
+      def tmp_additional_ssh_private_keys_dir
+        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)
       end
@@ -1096,6 +1108,19 @@ module Kitchen
         end
       end
 
+      def prepare_additional_ssh_private_keys
+        info('Preparing additional_ssh_private_keys')
+        FileUtils.mkdir_p(tmp_additional_ssh_private_keys_dir)
+        if config[:additional_ssh_private_keys]
+          config[:additional_ssh_private_keys].each do |key|
+            debug("Adding additional_ssh_private_key file #{key}")
+            FileUtils.cp_r(key, tmp_additional_ssh_private_keys_dir, remove_destination: true)
+          end
+        else
+          info 'nothing to do for additional_ssh_private_keys'
+        end
+      end
+
       def prepare_ansible_vault_password_file
         return unless ansible_vault_password_file
 

data/lib/kitchen-ansible/version.rb

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

data/provisioner_options.md

@@ -28,6 +28,7 @@ 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
+additional_ssh_private_keys | | List of additional ssh private key files to be added to ~/.ssh
 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.46.2
+  version: 0.46.3
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen