kitchen-ansible 0.48.5 → 0.48.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ae64a9bf60c79cd925b28a1feeaab6b9e157aaa
-  data.tar.gz: 519f333100157d297faea9d93cb755dfd941ff7a
+  metadata.gz: 2aacf7ab5b66aab2f5605e8dd601fed542f3331c
+  data.tar.gz: 0c65375cbe9d589d27be5aa0e62bb9bfd0b3dab1
 SHA512:
-  metadata.gz: b26ed031d8e00da5ce1bf347987e638a15bab942e848b350be59478c6d3d838147424187315331bca4415a3713845c11ab0a32c2ae221126eb3c7b85e89b1415
-  data.tar.gz: 7de899411d95bb8aec8cac0025a02a0c2ba0bdd3ba04278d98eaca21b9b4370c9d7948bfdf0dc8dce3f120ede9d82cf5af6e5aaffb72441e481fdf80cf4e9ceb
+  metadata.gz: ea700d4d1670ef5f7f1ce80712ea99e3951eade045a393aa8966efc68cab5bda0ad1d384606d2b5ea188cfa5fcb5cc8ef92820e62e539ec78f08c3322c533f94
+  data.tar.gz: ab1ca6713358784aed798462f2c6acf6937c587a465d97ba4e549d2d01bd5b9b468219b8fa80c70eca2d62a4760f10725fc889d19d085e6f5456152caa3fd9e3

data/lib/kitchen-ansible/version.rb

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

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

@@ -73,6 +73,8 @@ module Kitchen
         default_config :ansible_playbook_command, nil
         default_config :ansible_host_key_checking, true
         default_config :idempotency_test, nil
+        default_config :idempotency_tags, []
+        default_config :idempotency_skip_tags, []
         default_config :ansible_inventory, nil
         default_config :ansible_inventory_file, nil
         default_config :ansible_limit, nil

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -401,25 +401,29 @@ module Kitchen
         cmd = "#{cd_ansible} #{cmd}" if !config[:ansible_sudo].nil? && !config[:ansible_sudo]
         cmd = "#{copy_private_key_cmd} #{cmd}" if config[:private_key]
 
-        result = [
-          cmd,
-          ansible_inventory_flag,
-          ansible_limit_flag,
-          ansible_connection_flag,
-          "-M #{File.join(config[:root_path], 'modules')}",
-          ansible_verbose_flag,
-          ansible_check_flag,
-          ansible_diff_flag,
-          ansible_vault_flag,
-          private_key,
-          extra_vars,
-          extra_vars_file,
-          tags,
-          ansible_extra_flags,
-          "#{File.join(config[:root_path], File.basename(config[:playbook]))}"
-        ].join(' ')
+        def _run(cmd, idempotence = false)
+          [
+            cmd,
+            ansible_inventory_flag,
+            ansible_limit_flag,
+            ansible_connection_flag,
+            "-M #{File.join(config[:root_path], 'modules')}",
+            ansible_verbose_flag,
+            ansible_check_flag,
+            ansible_diff_flag,
+            ansible_vault_flag,
+            private_key,
+            extra_vars,
+            extra_vars_file,
+            tags(idempotence),
+            ansible_extra_flags,
+            "#{File.join(config[:root_path], File.basename(config[:playbook]))}"
+          ].join(' ')
+        end
+        result = _run(cmd)
         if config[:idempotency_test]
-          result = "#{result} && (echo 'Going to invoke ansible-playbook second time:'; #{result} | tee /tmp/idempotency_test.txt; if grep -qE 'changed=[1-9].*failed=|changed=.*failed=[1-9]' /tmp/idempotency_test.txt; then echo 'Idempotence test: FAIL' && exit 1; else echo 'Idempotence test: PASS' && exit 0; fi)"
+          idempotency_result = _run(cmd, true)
+          result = "#{result} && (echo 'Going to invoke ansible-playbook second time:'; #{idempotency_result} | tee /tmp/idempotency_test.txt; if grep -qE 'changed=[1-9].*failed=|changed=.*failed=[1-9]' /tmp/idempotency_test.txt; then echo 'Idempotence test: FAIL' && exit 1; else echo 'Idempotence test: PASS' && exit 0; fi)"
         end
         if config[:custom_post_play_command]
           custom_post_play_trap = <<-TRAP
@@ -824,14 +828,24 @@ module Kitchen
         bash_extra_vars
       end
 
-      def tags
+      def tags(idempotence = false)
         bash_tags = config.key?(:attributes) && config[:attributes].key?(:tags) && config[:attributes][:tags].is_a?(Array) ? config[:attributes][:tags] : config[:tags]
-        return nil if bash_tags.empty?
+        bash_skip_tags = []
+        if idempotence and config[:idempotency_test]
+          bash_tags += config[:idempotency_tags]
+          bash_skip_tags += config[:idempotency_skip_tags]
+        end
+        return nil if (bash_tags.empty? and bash_skip_tags.empty?)
 
-        bash_tags = bash_tags.join(',')
-        bash_tags = "-t '#{bash_tags}'"
-        debug(bash_tags)
-        bash_tags
+        result = ''
+        if not bash_tags.empty?
+          result += " --tags=#{bash_tags.join(',')}"
+        end
+        if not bash_skip_tags.empty?
+          result += " --skip-tags=#{bash_skip_tags.join(',')}"
+        end
+        debug(result)
+        result
       end
 
       def chef_url

data/provisioner_options.md

@@ -73,6 +73,8 @@ hosts |  | Create Ansible hosts file for localhost with this server group or lis
 http_proxy | nil | Use HTTP proxy when installing Ansible, packages and running Ansible
 https_proxy | nil | Use HTTPS proxy when installing Ansible, packages and running Ansible
 idempotency_test | false | Enable to test Ansible playbook idempotency
+idempotency_tags | [] | Adds a `--tags` parameter with the specified tags to the second invocation of `ansible-playbook` when `idempotency_test` is set to `true`
+idempotency_skip_tags | [] | Adds a `--skip-tags` parameter with the specified tags to the second invocation of `ansible-playbook` when `idempotency_test` is set to `true`
 ignore_extensions_from_root | ['.pyc'] | allow extensions to be ignored when copying from roles using additional_copy_role_path or doing recursive_additional_copy_path
 ignore_paths_from_root | [] | allow extra paths to be ignored when copying from roles using additional_copy_role_path or using recursive_additional_copy_path
 kerberos_conf_file | | Path of krb5.conf file using in Windows support

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.48.5
+  version: 0.48.6
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-31 00:00:00.000000000 Z
+date: 2018-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec