kitchen-ansiblepush 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2e12072dcae81c81afb9388535fdeeef2846d12
-  data.tar.gz: 0099b69a7fb1d2f614ee69ccef084a14950ca867
+  metadata.gz: f868950792eff721e4655c0687470892baa43e53
+  data.tar.gz: f470fad4ccf0f485d72cb44679d4f552960f7cad
 SHA512:
-  metadata.gz: 35bcaa476ac4b818bc7c12fa148a460aeda47c47e93159c01c928792166fb73be2881ab01cd60f3271712cc97da8b2718057fa9af571c0af2a06cd7675b823ca
-  data.tar.gz: 6d31523f1c82aa7e2306620ea81ad24b0ade2a8962fd2b806a1f54c6798f9b9544bdd8fbb7764393095402684033091c5f9bdcdb662e6081de360c309534b094
+  metadata.gz: de09cf33c70ac1bd34c68daee546d01117fbe68a17001bae1067a5800374a31826d6d7ac684aefdbeabe547333fa90f810efaf853b5125dd6cd65424b8a6556e
+  data.tar.gz: 80a146900bea7fa18356b1280eda4fdc84e0932f691f484bf254fb28b750956e62c4c986cd3bce3395b65752665498bbddd1e7390e26e9be647febde87cf12ae

data/lib/kitchen-ansible/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module AnsiblePush
-    VERSION = "0.3.5"
+    VERSION = "0.3.6"
   end
 end

data/lib/kitchen/provisioner/ansible_push.rb

@@ -1,3 +1,4 @@
+require 'open3'
 require 'kitchen'
 require 'kitchen/provisioner/base'
 require 'kitchen-ansible/util-inventory.rb'
@@ -14,6 +15,7 @@ module Kitchen
   module Provisioner
     class AnsiblePush < Base
       kitchen_provisioner_api_version 2
+      default_config :ansible_playbook_bin, "ansible-playbook"
       default_config :ansible_config, nil
       default_config :verbose, nil
       default_config :diff, nil
@@ -33,16 +35,114 @@ module Kitchen
       default_config :mygroup, nil
       default_config :playbook, nil
       default_config :generate_inv, true
+      default_config :generate_inv_path, "`which kitchen-ansible-inventory`"
       default_config :raw_arguments, nil
       default_config :idempotency_test, false
 
       # For tests disable if not needed
       default_config :chef_bootstrap_url, "https://www.getchef.com/chef/install.sh"
 
+      default_config :support_older_version, false
+
+      # Validates the config and returns it.  Has side-effect of
+      # possibly setting @extra_vars which doesn't seem to be used
+      def conf
+        return @validated_config if defined? @validated_config
+
+        if !config[:playbook]
+          raise 'No playbook defined. Please specify one in .kitchen.yml'
+        end
+
+        if !File.exist?(config[:playbook])
+          raise "playbook '%s' could not be found. Please check path" % config[:playbook]
+        end
+
+        if config[:vault_password_file] and !File.exist?(config[:vault_password_file])
+          raise "Vault password '%s' could not be found. Please check path" % config[:vault_password_file]
+        end
+
+        # Validate that extra_vars is either a hash, or a path to an existing file
+        if config[:extra_vars]
+          extra_vars_is_valid = config[:extra_vars].kind_of?(Hash) || config[:extra_vars].kind_of?(String)
+          if config[:extra_vars].kind_of?(String)
+            # Accept the usage of '@' (e.g. '@vars.yml' and 'vars.yml' are both supported)
+            match_data = /^@?(.+)$/.match(config[:extra_vars])
+            extra_vars_path = match_data[1].to_s
+            expanded_path = Pathname.new(extra_vars_path).expand_path(Dir.pwd)
+            extra_vars_is_valid = expanded_path.exist?
+            if extra_vars_is_valid
+              @extra_vars = '@' + extra_vars_path
+            end
+          end
+          if !extra_vars_is_valid
+            raise "ansible extra_vars is in valid type: %s value: %s" % [config[:extra_vars].class.to_s, config[:extra_vars].to_s]
+          end
+        end
+        
+        info("Ansible push config validated")
+        
+        @validated_config = config
+      end
+
+      def machine_name
+        return @machine_name if defined? @machine_name
+        @machine_name = instance.name.gsub(/[<>]/, '').split("-").drop(1).join("-")
+        debug("machine_name=" + @machine_name.to_s)
+        @machine_name
+      end
+
+      def options
+        return @options if defined? @options
+        options = []
+        options << "--extra-vars='#{self.get_extra_vars_argument}'" if conf[:extra_vars]
+        options << "--sudo" if conf[:sudo]
+        options << "--sudo-user=#{conf[:sudo_user]}" if conf[:sudo_user]
+        options << "--user=#{conf[:remote_user]}" if self.get_remote_user
+        options << "--private-key=#{conf[:private_key]}" if conf[:private_key]
+        options << "#{self.get_verbosity_argument}" if conf[:verbose]
+        options << "--diff" if conf[:diff]
+        options << "--ask-sudo-pass" if conf[:ask_sudo_pass]
+        options << "--ask-vault-pass" if conf[:ask_vault_pass]
+        options << "--vault-password-file=#{conf[:vault_password_file]}" if conf[:vault_password_file]
+        options << "--tags=%s" % self.as_list_argument(conf[:tags]) if conf[:tags]
+        options << "--skip-tags=%s" % self.as_list_argument(conf[:skip_tags]) if conf[:skip_tags]
+        options << "--start-at-task=#{conf[:start_at_task]}" if conf[:start_at_task]
+        options << "--inventory-file=#{conf[:generate_inv_path]}" if conf[:generate_inv]
+        ##options << "--inventory-file=#{ssh_inv}," if ssh_inv
+
+        # By default we limit by the current machine,
+        if conf[:limit]
+          options << "--limit=#{as_list_argument(conf[:limit])}"
+        else
+          options << "--limit=#{machine_name}"
+        end
+
+        #Add raw argument as final thing
+        options << conf[:raw_arguments] if conf[:raw_arguments]
+        @options = options
+      end
+
+      def command
+        return @command if defined? @command
+        @command = [conf[:ansible_playbook_bin]]
+        @command =  (@command << options() << conf[:playbook]).flatten.join(" ")
+        debug("Ansible push command= %s" % @command)
+        @command
+      end
+
+      def command_env
+        return @command_env if defined? @command_env
+        @command_env = {
+          "PYTHONUNBUFFERED" => "1", # Ensure Ansible output isn't buffered
+          "ANSIBLE_FORCE_COLOR" => "true",
+          "ANSIBLE_HOST_KEY_CHECKING" => "#{conf[:host_key_checking]}",
+        }
+        @command_env["ANSIBLE_CONFIG"]=conf[:ansible_config] if conf[:ansible_config]
+        @command_env
+      end
+
       def prepare_command
-        validate_config
-        prepare_inventory if config[:generate_inv]
-        complie_config
+        prepare_inventory if conf[:generate_inv]
         # Place holder so a string is returned. This will execute true on remote host 
         return "true"
       end
@@ -50,12 +150,22 @@ module Kitchen
       def install_command
         # Must install chef for busser and serverspec to work :(
         info("*************** AnsiblePush install_command ***************")
-        omnibus_download_dir = config[:omnibus_cachier] ? "/tmp/vagrant-cache/omnibus_chef" : "/tmp"
-        chef_url = config[:chef_bootstrap_url]
+        older_version = conf[:support_older_version]
+        if older_version
+          stdin, stdout, stderr = Open3.popen3(command_env(), command() + " --version") 
+          version_output = stdout.read()
+          version_string = version_output.split()[1]
+        end
+
+        omnibus_download_dir = conf[:omnibus_cachier] ? "/tmp/vagrant-cache/omnibus_chef" : "/tmp"
+        chef_url = conf[:chef_bootstrap_url]
+
         if chef_url
-          <<-INSTALL
-            sh -c '
-            #{Util.shell_helpers}
+          scripts = []
+
+          scripts << Util.shell_helpers
+
+          scripts << <<-INSTALL
             if [ ! -d "/opt/chef" ]
             then
               echo "-----> Installing Chef Omnibus needed by busser and serverspec"
@@ -68,26 +178,49 @@ module Kitchen
               sudo sh #{omnibus_download_dir}/install.sh -d #{omnibus_download_dir}
               echo "-----> End Installing Chef Omnibus"
             fi
+          INSTALL
+
+          if (older_version) and(version_string.split('.').map{|s|s.to_i} <=> [1, 6, 0]) < 0
+            info("Ansible Version < 1.6.0")
+            scripts << <<-INSTALL
+              # Older versions of ansible do not set up python-apt or
+              # python-pycurl by default on Ubuntu
+              # https://github.com/ansible/ansible/issues/4079
+              # https://github.com/ansible/ansible/issues/6910
+              echo "-----> Installing python-apt, python-pycurl if needed"
+              /usr/bin/python -c "import apt, apt_pkg, pycurl" 2>&1 > /dev/null || \
+                { [ -x /usr/bin/apt-get ] && \
+                sudo /usr/bin/apt-get update && \
+                sudo /usr/bin/apt-get install python-apt python-pycurl -y -q \
+                ; }
+              echo "-----> End Installing python-apt, python-pycurl if needed"
+            INSTALL
+          end
 
+          scripts << <<-INSTALL
             # Fix for https://github.com/test-kitchen/busser/issues/12
             if [ -h /usr/bin/ruby ]; then
                 L=$(readlink -f /usr/bin/ruby)
                 sudo rm /usr/bin/ruby
                 sudo ln  -s $L /usr/bin/ruby
             fi
-            '
+          INSTALL
+
+          <<-INSTALL
+            sh -c '#{scripts.join("\n")}'
           INSTALL
         end
       end
 
       def run_command
         info("*************** AnsiblePush run ***************")
-        exec_ansible_command(@command_env, @command, "ansible-playbook")
+        exec_ansible_command(command_env(), command(), "ansible-playbook")
         # idempotency test
-        if config[:idempotency_test]
+        if conf[:idempotency_test]
           info("*************** idempotency test ***************")
-          @command_env["ANSIBLE_CALLBACK_PLUGINS"] = "#{File.dirname(__FILE__)}/../../../callback/"
-          exec_ansible_command(@command_env, @command, "ansible-playbook")
+          exec_ansible_command(command_env().merge({
+             "ANSIBLE_CALLBACK_PLUGINS" => "#{File.dirname(__FILE__)}/../../../callback/"
+            }), command(), "ansible-playbook")
           # Check ansible callback if changes has occured in the second run
           file_path = "/tmp/kitchen_ansible_callback/changes"
           if File.file?(file_path)
@@ -106,7 +239,7 @@ module Kitchen
           end
         end
         info("*************** AnsiblePush end run *******************")
-        debug("[#{name}] Converge completed (#{config[:sleep]}s).")
+        debug("[#{name}] Converge completed (#{conf[:sleep]}s).")
         # Place holder so a string is returned. This will execute true on remote host 
         return "true"    
       end
@@ -123,111 +256,41 @@ module Kitchen
         end
       end
 
-      def prepare_inventory
-        @machine_name = instance.name.gsub(/[<>]/, '').split("-").drop(1).join("-")
-        debug("machine_name=" + @machine_name.to_s)
+      def instance_connection_option
+        return @instance_connection_option if defined? @instance_connection_option
         @instance_connection_option = instance.transport.instance_variable_get(:@connection_options)
         debug("instance_connection_option=" + @instance_connection_option.to_s)
-        hostname =  if @instance_connection_option.nil?
-                       @machine_name
+        @instance_connection_option
+      end
+
+      def prepare_inventory
+        hostname =  if instance_connection_option().nil?
+                       machine_name
                     else
-                        @instance_connection_option[:hostname]
+                        instance_connection_option()[:hostname]
                     end
         debug("hostname=" + hostname)
-        write_instance_inventory(@machine_name, hostname, config[:mygroup], @instance_connection_option)
-      end
-
-      def complie_config()
-        debug("compile_config")
-        options = []
-        options << "--extra-vars='#{self.get_extra_vars_argument}'" if config[:extra_vars]
-        options << "--sudo" if config[:sudo]
-        options << "--sudo-user=#{config[:sudo_user]}" if config[:sudo_user]
-        options << "--user=#{config[:remote_user]}" if self.get_remote_user
-        options << "--private-key=#{config[:private_key]}" if config[:private_key]
-        options << "#{self.get_verbosity_argument}" if config[:verbose]
-        options << "--diff" if config[:diff]
-        options << "--ask-sudo-pass" if config[:ask_sudo_pass]
-        options << "--ask-vault-pass" if config[:ask_vault_pass]
-        options << "--vault-password-file=#{config[:vault_password_file]}" if config[:vault_password_file]
-        options << "--tags=%s" % self.as_list_argument(config[:tags]) if config[:tags]
-        options << "--skip-tags=%s" % self.as_list_argument(config[:skip_tags]) if config[:skip_tags]
-        options << "--start-at-task=#{config[:start_at_task]}" if config[:start_at_task]
-        options << "--inventory-file=`which kitchen-ansible-inventory`" if config[:generate_inv]
-        ##options << "--inventory-file=#{ssh_inv}," if ssh_inv
-        
-        # By default we limit by the current machine,
-        if config[:limit]
-          options << "--limit=#{as_list_argument(config[:limit])}"
-        else
-          options << "--limit=#{@machine_name}"
-        end
-      
-        #Add raw argument as final thing
-        options << config[:raw_arguments] if config[:raw_arguments]
-
-        @command = (%w(ansible-playbook) << options << config[:playbook]).flatten.join(" ")
-        debug("Ansible push command= %s" % @command)
-        @command_env = {
-          "PYTHONUNBUFFERED" => "1", # Ensure Ansible output isn't buffered
-          "ANSIBLE_FORCE_COLOR" => "true",
-          "ANSIBLE_HOST_KEY_CHECKING" => "#{config[:host_key_checking]}",
-        }
-        @command_env["ANSIBLE_CONFIG"]=config[:ansible_config] if config[:ansible_config]
-        info("Ansible push compile conig done")
-      end
-
-      def validate_config()
-        if !config[:playbook]
-          raise 'No playbook defined. Please specify one in .kitchen.yml'
-        end
-
-        if !File.exist?(config[:playbook])
-          raise "playbook '%s' could not be found. Please check path" % config[:playbook]
-        end
-
-        if config[:vault_password_file] and !File.exist?(config[:vault_password_file])
-          raise "Vault password '%s' could not be found. Please check path" % config[:vault_password_file]
-        end
-
-        # Validate that extra_vars is either a hash, or a path to an existing file
-        if config[:extra_vars]
-          extra_vars_is_valid = config[:extra_vars].kind_of?(Hash) || config[:extra_vars].kind_of?(String)
-          if config[:extra_vars].kind_of?(String)
-            # Accept the usage of '@' (e.g. '@vars.yml' and 'vars.yml' are both supported)
-            match_data = /^@?(.+)$/.match(config[:extra_vars])
-            extra_vars_path = match_data[1].to_s
-            expanded_path = Pathname.new(extra_vars_path).expand_path(Dir.pwd)
-            extra_vars_is_valid = expanded_path.exist?
-            if extra_vars_is_valid
-              @extra_vars = '@' + extra_vars_path
-            end
-          end
-          if !extra_vars_is_valid
-            raise "ansible extra_vars is in valid type: %s value: %s" % [config[:extra_vars].class.to_s, config[:extra_vars].to_s]
-          end
-        end
-        
-        info("Ansible push config validated")
+        write_instance_inventory(machine_name, hostname,
+            conf[:mygroup], instance_connection_option())
       end
 
       def get_extra_vars_argument()
-        if config[:extra_vars].kind_of?(String) and config[:extra_vars] =~ /^@.+$/
+        if conf[:extra_vars].kind_of?(String) and conf[:extra_vars] =~ /^@.+$/
           # A JSON or YAML file is referenced (requires Ansible 1.3+)
-          return config[:extra_vars]
+          return conf[:extra_vars]
         else
         # Expected to be a Hash after config validation. (extra_vars as
         # JSON requires Ansible 1.2+, while YAML requires Ansible 1.3+)
-          return config[:extra_vars].to_json
+          return conf[:extra_vars].to_json
         end
       end
 
       def get_remote_user
-        if config[:remote_user]
-          return config[:remote_user]
-        elsif !@instance_connection_option.nil? and @instance_connection_option[:username]
-          config[:remote_user] = @instance_connection_option[:username]
-          return @instance_connection_option[:username]
+        if conf[:remote_user]
+          return conf[:remote_user]
+        elsif !instance_connection_option().nil? and instance_connection_option()[:username]
+          conf[:remote_user] = instance_connection_option()[:username]
+          return instance_connection_option()[:username]
         else
           return false
         end
@@ -238,9 +301,9 @@ module Kitchen
       end
 
       def get_verbosity_argument
-        if config[:verbose].to_s =~ /^v+$/
+        if conf[:verbose].to_s =~ /^v+$/
           # ansible-playbook accepts "silly" arguments like '-vvvvv' as '-vvvv' for now
-          return "-#{config[:verbose]}"
+          return "-#{conf[:verbose]}"
         else
         # safe default, in case input strays
           return '-v'
@@ -249,4 +312,4 @@ module Kitchen
 
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansiblepush
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Adham Helal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-05 00:00:00.000000000 Z
+date: 2015-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen