kitchen-ansible 0.0.13 → 0.0.14

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7c76809e1ae3af15a1af70c8e2a3506592a5a3fa
+  data.tar.gz: ead9e832b47e8509069250df3b4c76f073894205
+SHA512:
+  metadata.gz: c618628de49ae2e74afbce52a93c09b45f125174fb743e79e009d442d515899cab1ce6ebe71600a1198317a52a5fce9d62d47bc3914203a328b3f277e2e68537
+  data.tar.gz: da7d1fd5f358c495f082bef1d0c0d0f372123a97c73a69dc686bba5d8d5e499e7e04a5e747af22883eb57ea086c77fa0538246225eef03528f6bca3f63517eef

data/README.md

@@ -1,6 +1,7 @@
 # kitchen-ansible
 
 [![Gem Version](https://badge.fury.io/rb/kitchen-ansible.svg)](http://badge.fury.io/rb/kitchen-ansible)
+[![Gem Downloads](http://ruby-gem-downloads-badge.herokuapp.com/kitchen-ansible?type=total&color=brightgreen)](https://rubygems.org/gems/kitchen-ansible)
 
 A Test Kitchen Provisioner for Ansible
 

data/lib/kitchen-ansible/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Ansible
-    VERSION = "0.0.13"
+    VERSION = "0.0.14"
   end
 end

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -85,6 +85,10 @@ module Kitchen
          provisioner.calculate_path('filter_plugins', :directory)
       end
 
+      default_config :ansible_vault_password_file do |provisioner|
+        provisioner.calculate_path('ansible-vault-password', :file)
+      end
+
       default_config :requirements_path, false
       default_config :ansible_verbose, false
       default_config :ansible_verbosity, 1
@@ -149,7 +153,7 @@ module Kitchen
           if [ ! $(which ansible) ]; then
            #{update_packages_debian_cmd}
             ## Install apt-utils to silence debconf warning: http://serverfault.com/q/358943/77156
-            #{sudo('apt-get')} -y install apt-utils
+            #{sudo('apt-get')} -y install apt-utils git
             ## Fix debconf tty warning messages
             export DEBIAN_FRONTEND=noninteractive
             ## 13.10, 14.04 include add-apt-repository in software-properties-common
@@ -276,6 +280,7 @@ module Kitchen
           prepare_host_vars
           prepare_hosts
           prepare_filter_plugins
+          prepare_ansible_vault_password_file
           info('Finished Preparing files for transfer')
 
         end
@@ -327,6 +332,7 @@ module Kitchen
             ansible_verbose_flag,
             ansible_check_flag,
             ansible_diff_flag,
+            ansible_vault_flag,
             extra_vars,
             tags,
             "#{File.join(config[:root_path], File.basename(config[:playbook]))}",
@@ -362,6 +368,10 @@ module Kitchen
           File.join(sandbox_path, 'filter_plugins')
         end
 
+        def tmp_ansible_vault_password_file_path
+          File.join(sandbox_path, File.basename(ansible_vault_password_file))
+        end
+
         def ansiblefile
           config[:ansiblefile_path] || ''
         end
@@ -395,7 +405,7 @@ module Kitchen
         end
 
         def addt_dir
-          config[:additional_copy_path].to_s
+          config[:additional_copy_path]
         end
 
         def host_vars
@@ -406,6 +416,9 @@ module Kitchen
           config[:filter_plugins_path].to_s
         end
 
+        def ansible_vault_password_file
+          config[:ansible_vault_password_file]
+        end
 
         def ansible_debian_version
           config[:ansible_version] ? "=#{config[:ansible_version]}" : nil
@@ -427,6 +440,11 @@ module Kitchen
           config[:ansible_diff] ? '--diff' : nil
         end
 
+        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]))}" : nil
+        end
+
         def ansible_platform
           config[:ansible_platform].to_s.downcase
         end
@@ -500,15 +518,22 @@ module Kitchen
         def prepare_ansible_cfg
           info('Preparing ansible.cfg file')
           ansible_config_file = "#{File.join(sandbox_path, 'ansible.cfg')}"
-          if config[:roles_path].nil?
+
+          roles_paths = []
+          roles_paths << File.join(config[:root_path], 'roles') unless config[:roles_path].nil?
+          additional_dirs.each do |additional_dir|
+            roles_paths << File.join(config[:root_path], File.basename(additional_dir))
+          end
+
+          if roles_paths.empty?
             info('No roles have been set. empty ansible.cfg generated')
             File.open(ansible_config_file, "wb") do |file|
                file.write("#no roles path specified\n")
             end
           else
-            debug("Setting roles_path inside VM to #{File.join(config[:root_path], 'roles')}")
+            debug("Setting roles_path inside VM to #{ roles_paths.join(':') }")
             File.open( ansible_config_file, "wb") do |file|
-               file.write("[defaults]\nroles_path = #{File.join(config[:root_path], 'roles')}\n")
+               file.write("[defaults]\nroles_path = #{ roles_paths.join(':') }\n")
             end
           end
         end
@@ -553,16 +578,30 @@ module Kitchen
 
         def prepare_addt_dir
           info('Preparing additional_copy_path')
-          tmp_addt_dir = File.join(sandbox_path, File.basename(addt_dir))
-          FileUtils.mkdir_p(tmp_addt_dir)
 
-          unless File.directory?(addt_dir)
-            info 'nothing to do for additional_copy_path'
-            return
+          additional_dirs.each do |additional_dir|
+
+            tmp_addt_dir = File.join(sandbox_path, File.basename(additional_dir))
+            FileUtils.mkdir_p(tmp_addt_dir)
+
+            unless File.directory?(additional_dir)
+              info "invalid value #{additional_dir} in additional_copy_path"
+              return
+            end
+
+            debug("Using additional_copy_path from #{additional_dir}")
+            FileUtils.cp_r(Dir.glob("#{additional_dir}/*"), tmp_addt_dir)
           end
+        end
 
-          debug("Using additional_copy_path from #{addt_dir}")
-          FileUtils.cp_r(Dir.glob("#{addt_dir}/*"), tmp_addt_dir)
+        def additional_dirs
+          additional_dirs = []
+
+          if ( addt_dir )
+            additional_dirs = addt_dir.kind_of?(Array) ? addt_dir : [addt_dir]
+          end
+
+          additional_dirs.map { |additional_dir| additional_dir.to_s }
         end
 
         def prepare_host_vars
@@ -603,6 +642,12 @@ module Kitchen
           end
         end
 
+        def prepare_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}")
+          FileUtils.cp(ansible_vault_password_file, tmp_ansible_vault_password_file_path)
+        end
+
         def resolve_with_librarian
           Kitchen.mutex.synchronize do
             Ansible::Librarian.new(ansiblefile, tmp_roles_dir, logger).resolve

data/provisioner_options.md

@@ -6,8 +6,9 @@ key | default value | Notes
 ansible_version | "latest"| desired version, affects apt installs
 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
-ansible_yum_repo | "https://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm"| yum repo
+ansible_apt_repo | "ppa:ansible/ansible" | apt repo
+ansible_yum_repo | "https://download.fedoraproject.org | yum repo
+  | /pub/epel/6/i386/epel-release-6-8.noarch.rpm" |
 require_ansible_omnibus | false | Set if using omnibus ansible install
 ansible_omnibus_url | | omnibus ansible install location.
 ansible_omnibus_remote_path | "/opt/ansible" | Server Installation location of an omnibus ansible install.
@@ -15,7 +16,7 @@ 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
 filter_plugins | filter_plugins | ansible repo filter_plugins directory
-additional_copy_path | | arbitrary directory to copy into test environment, relative to CWD. (eg, vars)
+additional_copy_path | | arbitrary array of directories to copy into test environment, relative to CWD. (eg, vars)
 extra_vars | Hash.new | Hash to set the extra_vars passed to ansibile-playbook command
 playbook | 'site.yml' | playbook for ansible-playbook to run
 modules_path | | ansible repo manifests directory
@@ -27,6 +28,7 @@ update_package_repos| true| update OS repository metadata
 chef_bootstrap_url |"https://www.getchef.com/chef/install.sh"| the chef (needed for busser to run tests)
 ansiblefile_path | | Path to Ansiblefile
 requirements_path | | Path to ansible-galaxy requirements
+ansible_vault_password_file| | Path of Ansible Vault Password File
 
 ## Configuring Provisioner Options
 

metadata

@@ -1,77 +1,66 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.0.13
-  prerelease: 
+  version: 0.0.14
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! '== DESCRIPTION:
-
+description: |+
+  == DESCRIPTION:
 
   Ansible Provisioner for Test Kitchen
 
-
   == FEATURES:
 
-
   Supports running ansible-playbook
 
-
-'
 email:
 - neillwturner@gmail.com
 executables: []
@@ -86,26 +75,25 @@ files:
 - provisioner_options.md
 homepage: https://github.com/neillturner/kitchen-ansible
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: ! '[none]'
-rubygems_version: 1.8.24
+rubyforge_project: "[none]"
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ansible provisioner for test-kitchen
 test_files: []