kitchen-ansible 0.0.38 → 0.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f422d75ddb64f559d4e72b3743f804bfd42811a
-  data.tar.gz: 5e5e37babc96b86a42603cb1c68fe199db6f0dab
+  metadata.gz: cc8e839edd7ff2c945b63d651c20c51abd0e7135
+  data.tar.gz: a2be99ad62a1cb475f4c4f89e80b5976a79960b2
 SHA512:
-  metadata.gz: dc5b43fb8f86636599610b826f8f0ab6e4b957ca16e2ef430a57f5e6caf7450f8fd28d2814e06bd577907b307bd596152794b5166a27ad6a7a2989bb9f24a1d3
-  data.tar.gz: 25b2b7b372f529bebb63a50f29127edfe7acab14f17a428dbce19afbd679c51716ea0d4494ee8fe37bd850d8eac86479b773187c24f516befe5dae62935338c2
+  metadata.gz: 1a66511b709d9a166ae14633d620f7f8d04ff6572308d41d19d991a5ffb1d6faf0abe04f134f01bd109d3ecfb9f94a1dbcc54b22f388ae3c682ad3e88d794697
+  data.tar.gz: 63aca35e02d85e9d8b902c01e472d58da63388f672b62cae9465e28bec04b26f45615297775679844d111fc63717e76c359a97bcb4397a3021d0282242715a41

data/lib/kitchen-ansible/version.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 module Kitchen
   module Ansible
-    VERSION = '0.0.38'
+    VERSION = '0.0.39'
   end
 end

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

@@ -66,6 +66,9 @@ module Kitchen
         default_config :ansible_playbook_command, nil
         default_config :ansible_host_key_checking, true
         default_config :idempotency_test, nil
+        default_config :ansible_inventory, nil
+        default_config :ansible_inventory_file, nil
+        default_config :ansible_limit, nil
 
         default_config :playbook do |provisioner|
           provisioner.calculate_path('default.yml', :file) ||
@@ -117,10 +120,6 @@ module Kitchen
           provisioner.calculate_path('ansible-vault-password', :file)
         end
 
-        default_config :ansible_inventory_file do |provisioner|
-          provisioner.calculate_path('hosts', :file)
-        end
-
         def initialize(config = {})
           init_config(config)
         end

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -207,7 +207,7 @@ module Kitchen
         yield if block_given?
 
         prepare_playbook
-        prepare_inventory_file
+        prepare_inventory
         prepare_modules
         prepare_roles
         prepare_ansible_cfg
@@ -257,6 +257,27 @@ module Kitchen
           end
         end
 
+        if ansible_inventory
+          if File.directory?(ansible_inventory)
+            Dir.foreach(ansible_inventory) do |f|
+              next if f == "." or f == ".."
+              contents = File.open("#{ansible_inventory}/#{f}", 'rb') { |g| g.read }
+              if contents.start_with?('#!')
+                commands << [
+                  sudo_env('chmod +x'), File.join("#{config[:root_path]}/#{File.basename(ansible_inventory)}", File.basename(f))
+                ].join(' ')
+              end
+            end
+          else
+            contents = File.open(ansible_inventory, 'rb') { |f| f.read }
+            if contents.start_with?('#!')
+              commands << [
+                sudo_env('chmod +x'), File.join(config[:root_path], File.basename(ansible_inventory))
+              ].join(' ')
+            end
+          end
+        end
+
         if galaxy_requirements
           if config[:require_ansible_source]
             commands << setup_ansible_env_from_source
@@ -300,6 +321,7 @@ module Kitchen
           result = [
             cmd,
             ansible_inventory_flag,
+            ansible_limit_flag,
             "-c #{config[:ansible_connection]}",
             "-M #{File.join(config[:root_path], 'modules')}",
             ansible_verbose_flag,
@@ -436,8 +458,8 @@ module Kitchen
         File.join(sandbox_path, File.basename(ansible_vault_password_file).reverse.chomp('.').reverse)
       end
 
-      def tmp_inventory_file_path
-        File.join(sandbox_path, File.basename(ansible_inventory_file))
+      def tmp_inventory_path
+        File.join(sandbox_path, File.basename(ansible_inventory))
       end
 
       def ansiblefile
@@ -504,8 +526,14 @@ module Kitchen
         config[:ansible_vault_password_file]
       end
 
-      def ansible_inventory_file
-        config[:ansible_inventory_file]
+      def ansible_inventory
+        config[:ansible_inventory] = config[:ansible_inventory_file] if config[:ansible_inventory].nil?
+        info('ansible_inventory_file parameter deprecated use ansible_inventory') if config[:ansible_inventory_file]
+        config[:ansible_inventory]
+      end
+
+      def ansible_debian_version
+        config[:ansible_version] ? "=#{config[:ansible_version]}" : nil
       end
 
       def ansible_verbose_flag
@@ -526,7 +554,11 @@ module Kitchen
       end
 
       def ansible_inventory_flag
-        config[:ansible_inventory_file] ? "--inventory-file=#{File.join(config[:root_path], File.basename(config[:ansible_inventory_file]))}" : "--inventory-file=#{File.join(config[:root_path], 'hosts')}"
+        config[:ansible_inventory] ? "-i #{File.join(config[:root_path], File.basename(config[:ansible_inventory]))}" : "-i #{File.join(config[:root_path], 'hosts')}"
+      end
+
+      def ansible_limit_flag
+        config[:ansible_limit] ? "-l #{config[:ansible_limit]}" : ""
       end
 
       def ansible_extra_flags
@@ -693,19 +725,23 @@ module Kitchen
         end
       end
 
-      def prepare_inventory_file
-        info('Preparing inventory file')
-
-        return unless ansible_inventory_file
-        debug("Copying inventory file from #{ansible_inventory_file} to #{tmp_inventory_file_path}")
-        FileUtils.cp_r(ansible_inventory_file, tmp_inventory_file_path)
+      def prepare_inventory
+        info('Preparing inventory')
+        return unless ansible_inventory
+        if File.directory?(ansible_inventory)
+          debug("Copying inventory directory from #{ansible_inventory} to #{tmp_inventory_path}")
+          FileUtils.cp_r(ansible_inventory, sandbox_path)
+        else
+          debug("Copying inventory file from #{ansible_inventory} to #{tmp_inventory_path}")
+          FileUtils.cp_r(ansible_inventory, tmp_inventory_path)
+        end
       end
 
       # localhost ansible_connection=local
       # [example_servers]
       # localhost
       def prepare_hosts
-        return if ansible_inventory_file
+        return if ansible_inventory
         info('Preparing hosts file')
 
         if config[:hosts].nil?

data/provisioner_options.md

@@ -39,8 +39,10 @@ ansiblefile_path | | Path to Ansiblefile
 requirements_path | | Path to ansible-galaxy requirements
 ansible_vault_password_file| | Path of Ansible Vault Password File
 ansible_connection | local | use 'ssh' if host not localhost
-ansible_inventory_file | hosts | Custom inventory file
-ansible_extra_flags | '' | Additional options to pass to `ansible-playbook` -- e.g.: `'--skip-tags=redis'`
+hosts |  | create ansible hosts file for localhost with this server group
+ansible_inventory |  | Static or dynamic inventory file or directory.
+ansible_limit |  | Further limits the selected host/group patterns.
+ansible_extra_flags |  | Additional options to pass to `ansible-playbook` -- e.g.: `'--skip-tags=redis'`
 ansible_playbook_command | | Override the ansible playbook command
 require_ruby_for_busser|false|install ruby to run busser for tests
 require_chef_for_busser|true|install chef to run busser for tests. NOTE: kitchen 1.4 only requires ruby to run busser so this is not required.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.0.38
+  version: 0.0.39
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen