kitchen-ansible 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 223abb6eceecdfa8a197428c4039c950c0e99ad8
-  data.tar.gz: 987c669a9bff598a0cec647eb08d81fe99042282
+  metadata.gz: 16cd84940415191d57d17430e877342b974a919f
+  data.tar.gz: c56bd4480019bc10db011459f1229b410bce82b1
 SHA512:
-  metadata.gz: c5ce4e7d6dbcecbe5c5e144fcf8b0b53c79aacdddc0565b3817d6c6374651240046531b207dade245debef173fc7b21ae1395672d3af54010bfe40d8c188626e
-  data.tar.gz: 3ee1cb4eef68554143bd32d5078f613f8f87fefddf829103d595db6e2bf302b93ca1bf4c9e4b2ea67661df8902dfef62ef35ba6b01b00052d7cb60ebd8f57206
+  metadata.gz: 4a8cd1f6e9d872899dde75f0dcfdff9a576ff9e8e58723144438c91e7b1f8eaaf9771d598b7a7e0b2f07c23b423ceed3e34d9e52f20340bf69b411f0d5aac338
+  data.tar.gz: 6a0a2e618696b3bb68d27983d77d6d75536418e0d585053848b9f24c7db957c5560d2ebffb92cca4ce0e9bd27834970404455457319f6e078d0c9a66d6b22f44

data/lib/kitchen-ansible/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Ansible
-    VERSION = "0.0.28"
+    VERSION = "0.0.29"
   end
 end

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -289,6 +289,10 @@ module Kitchen
         if http_proxy
           cmd = "HTTP_PROXY=#{http_proxy} #{cmd}"
         end
+        if ansible_roles_path
+          cmd = "ANSIBLE_ROLES_PATH=#{ansible_roles_path} #{cmd}"
+        end
+
         result = [
           cmd,
           ansible_inventory_flag,
@@ -666,6 +670,21 @@ module Kitchen
         cmd
       end
 
+      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))
+        end
+        if roles_paths.empty?
+          info('No roles have been set.')
+          nil
+        else
+          debug("Setting roles_path inside VM to #{ roles_paths.join(':') }")
+          roles_paths.join(':')
+        end
+      end
+
       def prepare_roles
         info('Preparing roles')
         debug("Using roles from #{roles}")
@@ -683,27 +702,17 @@ module Kitchen
         FileUtils.cp_r(Dir.glob("#{roles}/*"), File.join(tmp_roles_dir, role_name))
       end
 
-      # /etc/ansible/ansible.cfg should contain
-      # roles_path = /tmp/kitchen/roles
+      # copy ansible.cfg if found in root of repo
       def prepare_ansible_cfg
         info('Preparing ansible.cfg file')
         ansible_config_file = "#{File.join(sandbox_path, 'ansible.cfg')}"
-
-        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))
-        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
+        if File.exist?('ansible.cfg')
+           info("Found existing ansible.cfg")
+           FileUtils.cp_r('ansible.cfg', ansible_config_file)
         else
-          debug("Setting roles_path inside VM to #{ roles_paths.join(':') }")
-          File.open( ansible_config_file, "wb") do |file|
-             file.write("[defaults]\nroles_path = #{ roles_paths.join(':') }\n")
+          info('Empty ansible.cfg generated')
+          File.open(ansible_config_file, "wb") do |file|
+             file.write("#no config parameters\n")
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen