kitchen-ansiblepush 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c2574c5f3a6f5e72041eff1b93bdc9f58b9cdb4
-  data.tar.gz: 87261f0b8a379618e4b4450bb37a12ab5cf1a7aa
+  metadata.gz: 791f46b92aef964ec79f5ad49b1c70dbf9314b91
+  data.tar.gz: f1c1fc8f780e5eed9c40347deb9a8c2d7c575408
 SHA512:
-  metadata.gz: d203dcf0add9038341bdab6b1edef6e90709d45576e639706697f39513037382066c3a6e7d575c93b7e702a22ddbb445f56c1d857ed73db5208cc29cb1853922
-  data.tar.gz: b145ccbb8a988f4000b45459d91cd72590190fd0c9e3a4ee4615a96b0ad2078184f01d033d0912c5246b865101e87406f23052693169f013de6f2f14f37dde04
+  metadata.gz: 7dc39035080f59926a04488643dc53b57e531d69a31f59e0d7b82210f0b6937cd64fb3a8400482c2f2b8f5a7a028a89bc5cfaf49383474280ed5e3587cbc6f8d
+  data.tar.gz: 02645ad04663ed39f10f7e6845186e37b29c32e37258d33c2c175997ab58706a84184ad119c9715f42c16cd889178a2894cb382bb951cc9f2fa28e4defb55e2f

data/lib/kitchen-ansible/util-inventory.rb

@@ -5,9 +5,12 @@ TEMP_GROUP_FILE = "#{TEMP_INV_DIR}/ansiblepush_groups_inventory.yml"
 
 def write_instance_inventory(name, host, mygroup, instance_connection_option)
   Dir.mkdir TEMP_INV_DIR if !File.exist?(TEMP_INV_DIR)
-  port = instance_connection_option[:port]  
-  keys = instance_connection_option[:keys]  
-  user = instance_connection_option[:user]  
+  
+  unless instance_connection_option.nil?
+        port = instance_connection_option[:port]
+        keys = instance_connection_option[:keys]
+        user = instance_connection_option[:user]
+  end
 
   temp_hash = Hash.new
   temp_hash["ansible_ssh_host"] = host

data/lib/kitchen-ansible/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module AnsiblePush
-    VERSION = "0.3.3"
+    VERSION = "0.3.4"
   end
 end

data/lib/kitchen/provisioner/ansible_push.rb

@@ -43,6 +43,8 @@ module Kitchen
         validate_config
         prepare_inventory if config[:generate_inv]
         complie_config
+        # Place holder so a string is returned. This will execute true on remote host 
+        return "true"
       end
 
       def install_command
@@ -50,41 +52,42 @@ module Kitchen
         info("*************** AnsiblePush install_command ***************")
         omnibus_download_dir = config[:omnibus_cachier] ? "/tmp/vagrant-cache/omnibus_chef" : "/tmp"
         chef_url = config[:chef_bootstrap_url]
-        <<-INSTALL
-          sh -c '
-          #{Util.shell_helpers}
-          if [ ! -d "/opt/chef" ]
-          then
-            echo "-----> Installing Chef Omnibus"
-            mkdir -p #{omnibus_download_dir}
-            if [ ! -x #{omnibus_download_dir}/install.sh ]
+        if chef_url
+          <<-INSTALL
+            sh -c '
+            #{Util.shell_helpers}
+            if [ ! -d "/opt/chef" ]
             then
-              do_download #{chef_url} #{omnibus_download_dir}/install.sh
+              echo "-----> Installing Chef Omnibus"
+              mkdir -p #{omnibus_download_dir}
+              if [ ! -x #{omnibus_download_dir}/install.sh ]
+              then
+                do_download #{chef_url} #{omnibus_download_dir}/install.sh
+              fi
+
+              sudo sh #{omnibus_download_dir}/install.sh -d #{omnibus_download_dir}
+              echo "-----> End Installing Chef Omnibus"
             fi
 
-            sudo sh #{omnibus_download_dir}/install.sh -d #{omnibus_download_dir}
-            echo "-----> End Installing Chef Omnibus"
-          fi
-
-          # 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
-
+            # 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
+        end
       end
 
       def run_command
         info("*************** AnsiblePush run ***************")
-        exec_command(@command_env, @command, "ansible-playbook")
+        exec_ansible_command(@command_env, @command, "ansible-playbook")
         # idempotency test
         if config[:idempotency_test]
           info("*************** idempotency test ***************")
           @command_env["ANSIBLE_CALLBACK_PLUGINS"] = "#{File.dirname(__FILE__)}/../../../callback/"
-          exec_command(@command_env, @command, "ansible-playbook")
+          exec_ansible_command(@command_env, @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)
@@ -104,12 +107,13 @@ module Kitchen
         end
         info("*************** AnsiblePush end run *******************")
         debug("[#{name}] Converge completed (#{config[:sleep]}s).")
-        return nil        
+        # Place holder so a string is returned. This will execute true on remote host 
+        return "true"    
       end
 
       protected
 
-      def exec_command(env, command, desc)
+      def exec_ansible_command(env, command, desc)
         debug("env=%s command=%s" % [env, command] )
         system(env, "#{command}")
         exit_code = $?.exitstatus
@@ -121,16 +125,22 @@ module Kitchen
 
       def prepare_inventory
         @machine_name = instance.name.gsub(/[<>]/, '').split("-").drop(1).join("-")
+        debug("machine_name=" + @machine_name.to_s)
         @instance_connection_option = instance.transport.instance_variable_get(:@connection_options)
-        hostname = @instance_connection_option[:hostname]
         debug("instance_connection_option=" + @instance_connection_option.to_s)
+        hostname =  if @instance_connection_option.nil?
+                       @machine_name
+                    else
+                        @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 << "--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
@@ -197,6 +207,7 @@ module Kitchen
             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")
       end
 
@@ -214,11 +225,11 @@ module Kitchen
       def get_remote_user
         if config[:remote_user]
           return config[:remote_user]
-        elsif @instance_connection_option[:username]
+        elsif !@instance_connection_option.nil? and @instance_connection_option[:username]
           config[:remote_user] = @instance_connection_option[:username]
           return @instance_connection_option[:username]
         else
-          return nil
+          return false
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansiblepush
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Adham Helal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen