kitchen-ansible 0.46.0 → 0.46.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24e506b16b7566a6c179b3ba75f7bf0a49d932d9
-  data.tar.gz: 45e03baef7f9bb872622f085ce5a72488900d9b6
+  metadata.gz: b32daee00e5d86149852730c2886d4e57b5324d4
+  data.tar.gz: 60b860dff81e09a2e571903bcf659b6b0bf3b141
 SHA512:
-  metadata.gz: 402e8bff85a9b3c8a130cb314d466609558aa4c43073e8fb77d3096680d33772a0eaf58dccb24c7d07b82268d1bf523343cbb811b58143a7eedf6db2ae4e70f2
-  data.tar.gz: dc54f9033f6118c5af36d7b76ac500e209a5d0b59c39fbce9903cc1059b773773513afe37f6a8b4cb2617673281193641a1272903d777dc326cc4b2c10db6ee1
+  metadata.gz: 58da2f4aad784bed8f6a88ee035bcbfb25ce1305b0e8bca7e68eee0b6eb3d8514924f151043a4105ecca164051e0350980a73e942984f693a85e312cd3b436e5
+  data.tar.gz: 31a20f6821e86b2d69acb4185947e48b162e1bdfd6d1351b1c60789dac6b9c0b2ee8edcdf1534c273b4559f380c7c27626da7a61c6e118d1ee3d4e6e684dd1a3

data/lib/kitchen-ansible/version.rb

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

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

@@ -80,6 +80,10 @@ module Kitchen
         default_config :role_name, nil
         default_config :additional_copy_role_path, false
         default_config :shell_command, 'sh'
+        default_config :custom_pre_install_command, nil
+        default_config :custom_pre_play_command, nil
+        default_config :custom_post_install_command, nil
+        default_config :custom_post_play_command, nil
 
         default_config :playbook do |provisioner|
           provisioner.calculate_path('default.yml', :file) ||

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -106,7 +106,8 @@ module Kitchen
         else
           return
         end
-        result = cmd + install_windows_support + install_busser_prereqs
+
+        result = custom_pre_install_command + cmd + install_windows_support + install_busser_prereqs + custom_post_install_command
         debug("Going to install ansible with: #{result}")
         result
       end
@@ -234,6 +235,19 @@ module Kitchen
         install
       end
 
+      def custom_pre_install_command
+        <<-INSTALL
+
+          #{config[:custom_pre_install_command]}
+        INSTALL
+      end
+
+      def custom_post_install_command
+        <<-INSTALL
+          #{config[:custom_post_install_command]}
+        INSTALL
+      end
+
       def init_command
         dirs = %w(modules roles group_vars host_vars)
                .map { |dir| File.join(config[:root_path], dir) }.join(' ')
@@ -346,53 +360,64 @@ module Kitchen
       end
 
       def run_command
-        if !config[:ansible_playbook_command].nil?
-          return config[:ansible_playbook_command]
+        return config[:ansible_playbook_command] unless config[:ansible_playbook_command].nil?
+        if config[:require_ansible_source] && !config[:ansible_binary_path]
+          # this is an ugly hack to get around the fact that extra vars uses ' and "
+          cmd = ansible_command("PATH=#{config[:root_path]}/ansible/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games PYTHONPATH=#{config[:root_path]}/ansible/lib MANPATH=#{config[:root_path]}/ansible/docs/man ansible-playbook")
+        elsif config[:ansible_binary_path]
+          cmd = ansible_command("#{config[:ansible_binary_path]}/ansible-playbook")
         else
+          cmd = ansible_command('ansible-playbook')
+        end
 
-          if config[:require_ansible_source] && !config[:ansible_binary_path]
-            # this is an ugly hack to get around the fact that extra vars uses ' and "
-            cmd = ansible_command("PATH=#{config[:root_path]}/ansible/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games PYTHONPATH=#{config[:root_path]}/ansible/lib MANPATH=#{config[:root_path]}/ansible/docs/man ansible-playbook")
-          elsif config[:ansible_binary_path]
-            cmd = ansible_command("#{config[:ansible_binary_path]}/ansible-playbook")
-          else
-            cmd = ansible_command('ansible-playbook')
-          end
+        cmd = "#{env_vars} #{cmd}" if !config[:env_vars].none?
+        cmd = "HTTPS_PROXY=#{https_proxy} #{cmd}" if https_proxy
+        cmd = "HTTP_PROXY=#{http_proxy} #{cmd}" if http_proxy
+        cmd = "NO_PROXY=#{no_proxy} #{cmd}" if no_proxy
+        cmd = "ANSIBLE_ROLES_PATH=#{ansible_roles_path} #{cmd}" if ansible_roles_path
+        cmd = "ANSIBLE_HOST_KEY_CHECKING=false #{cmd}" if !ansible_host_key_checking
+
+        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(' ')
+        if config[:custom_post_play_command]
+          custom_post_play_trap = <<-TRAP
+            function custom_post_play_command {
+              #{config[:custom_post_play_command]}
+            }
+            trap custom_post_play_command EXIT
+          TRAP
+        end
+        result = <<-RUN
+          #{config[:custom_pre_play_command]}
+          #{custom_post_play_trap}
+          #{result}
+        RUN
+        debug("Going to invoke ansible-playbook with: #{result}")
+        if config[:idempotency_test]
+          result = "#{result} && (echo 'Going to invoke ansible-playbook second time:'; #{result} | tee /tmp/idempotency_test.txt; grep -q 'changed=0.*failed=0' /tmp/idempotency_test.txt && (echo 'Idempotence test: PASS' && exit 0) || (echo 'Idempotence test: FAIL' && exit 1))"
+          debug("Full cmd with idempotency test: #{result}")
+        end
 
-          cmd = "#{env_vars} #{cmd}" if !config[:env_vars].none?
-          cmd = "HTTPS_PROXY=#{https_proxy} #{cmd}" if https_proxy
-          cmd = "HTTP_PROXY=#{http_proxy} #{cmd}" if http_proxy
-          cmd = "NO_PROXY=#{no_proxy} #{cmd}" if no_proxy
-          cmd = "ANSIBLE_ROLES_PATH=#{ansible_roles_path} #{cmd}" if ansible_roles_path
-          cmd = "ANSIBLE_HOST_KEY_CHECKING=false #{cmd}" if !ansible_host_key_checking
-
-          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,
-            tags,
-            ansible_extra_flags,
-            "#{File.join(config[:root_path], File.basename(config[:playbook]))}"
-          ].join(' ')
-          debug("Going to invoke ansible-playbook with: #{result}")
-          if config[:idempotency_test]
-            result = "#{result} && (echo 'Going to invoke ansible-playbook second time:'; #{result} | tee /tmp/idempotency_test.txt; grep -q 'changed=0.*failed=0' /tmp/idempotency_test.txt && (echo 'Idempotence test: PASS' && exit 0) || (echo 'Idempotence test: FAIL' && exit 1))"
-            debug("Full cmd with idempotency test: #{result}")
-          end
+        result
 
-          result
-        end
       end
 
       def ansible_command(script)
@@ -747,13 +772,16 @@ module Kitchen
           bash_vars = config[:attributes][:extra_vars]
         end
 
-        return nil if bash_vars.none? and config[:extra_vars_file].nil?
-        if !bash_vars.none?
-          bash_extra_vars = JSON.dump(bash_vars)
-        else
-          bash_extra_vars = "\@#{config[:extra_vars_file]}"
-        end
-        bash_extra_vars = "-e '#{bash_extra_vars}'"
+        return nil if bash_vars.none?
+        bash_vars = JSON.dump(bash_vars)
+        bash_vars = "-e '#{bash_vars}'"
+        debug(bash_vars)
+        bash_vars
+      end
+
+      def extra_vars_file
+        return nil if config[:extra_vars_file].nil?
+        bash_extra_vars = "-e '\@#{config[:extra_vars_file]}'"
         debug(bash_extra_vars)
         bash_extra_vars
       end

data/provisioner_options.md

@@ -54,10 +54,14 @@ ansible_yum_repo | nil | `yum` repo for EL platforms
 ansiblefile_path | | Path to Ansiblefile
 callback_plugins_path | callback_plugins | Ansible repo `callback_plugins` directory
 chef_bootstrap_url | `https://www.getchef.com/chef/install.sh` | The Chef install
+custom_pre_install_command | nil | Custom shell command to be used at beginning of install stage. Can be multiline.
+custom_pre_play_command | nil | Custom shell command to be used before the ansible play stage. Can be multiline. See examples below.
+custom_post_install_command | nil | Custom shell command to be used at after the install stage. Can be multiline.
+custom_post_play_command | nil | Custom shell command to be used after the ansible play stage. Can be multiline. See examples below.
 enable_yum_epel | false | Enable the `yum` EPEL repo
 env_vars | Hash.new | Hash to set environment variable to use with `ansible-playbook` command
 extra_vars | Hash.new | Hash to set the `extra_vars` passed to `ansible-playbook` command
-extra_vars_file | nil | file containing environment variables e.g. `private_vars/production.yml site.yml` Only if extra_vars not specified. Don't prefix with a @ sign.
+extra_vars_file | nil | file containing environment variables e.g. `private_vars/production.yml site.yml` Don't prefix with a @ sign.
 filter_plugins_path | filter_plugins | Ansible repo `filter_plugins` directory
 group_vars_path | group_vars | Ansible repo group_vars directory
 host_vars_path | host_vars | Ansible repo hosts directory
@@ -132,3 +136,15 @@ $kitchen_root/ansible/$suite_name/roles
 $kitchen_root/ansible/$suite_name/modules
 $kitchen_root/ansible/$suite_name/Ansiblefile
 ```
+
+Multiple Line Structure
+```yaml
+provisioner::
+  command: |
+    sudo -s <<SERVERSPEC
+    cd /opt/gdc/serverspec-core
+    export SERVERSPEC_ENV=$EC2DATA_ENVIRONMENT
+    export SERVERSPEC_BACKEND=exec
+    serverspec junit=true tag=~skip_in_kitchen check:role:$EC2DATA_TYPE
+    SERVERSPEC
+```

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.46.0
+  version: 0.46.1
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-05 00:00:00.000000000 Z
+date: 2017-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen