kitchen-cloudstack 0.1.1 → 0.1.2

data/README.md

@@ -35,7 +35,8 @@ Then to specify different OS templates,
     OPTIONAL
       cloudstack_ssh_keypair_name: [SSH KEY NAME]
 To use the CloudStack public key provider, you need to have the .PEM file located in the same directory as
-your .kitchen.yml file.
+your .kitchen.yml file, your home directory (~), or your .ssh directory (~/.ssh/) and it must be named the same as the
+Keypair on CloudStack suffixed with .pem.
 
 By default, a unique server name will be generated and the randomly generated password will be used, though that
 behavior can be overridden with additional options (e.g., to specify a SSH private key):

data/lib/kitchen/driver/cloudstack.rb

@@ -77,23 +77,23 @@ module Kitchen
           require 'excon'
           Excon.defaults[:ssl_verify_peer] = false
         end
-        password = ''
-        if (!config[:cloudstack_ssh_keypair_name].nil?)
-          keypair = config[:cloudstack_ssh_keypair_name]
-        end
+
         server = create_server
         debug(server)
+
         state[:server_id] = server['deployvirtualmachineresponse'].fetch('id')
         jobid = server['deployvirtualmachineresponse'].fetch('jobid')
         info("CloudStack instance <#{state[:server_id]}> created.")
         debug("Job ID #{jobid}")
+
         server_start = compute.query_async_job_result('jobid'=>jobid)
         while server_start['queryasyncjobresultresponse'].fetch('jobstatus') == 0
           print ". "
           sleep(10)
           server_start = compute.query_async_job_result('jobid'=>jobid)
-          debug("Server_Start: #{server_start} \n")
         end
+        debug("Server_Start: #{server_start} \n")
+
         if server_start['queryasyncjobresultresponse'].fetch('jobstatus') == 2
           errortext = server_start['queryasyncjobresultresponse'].fetch('jobresult').fetch('errortext')
           error("ERROR! Job failed with #{errortext}")
@@ -104,40 +104,40 @@ module Kitchen
           debug(server_info)
           print "(server ready)"
 
-          #Check first if the API response has a keypair. I should probably just make this check the config, but this
-            #should save against typos in the config file.
-
-          if (!server_info.fetch('keypair').nil?)
-            state[:hostname] = server_info.fetch('nic').first.fetch('ipaddress')
-            info("SSH for #{state[:hostname]} with SSH Key #{server_info.fetch('keypair')}.")
-            if File.exist?("./#{server_info.fetch('keypair')}.pem")
-              keypair = "./#{server_info.fetch('keypair')}.pem"
-            elsif File.exist?("~/#{server_info.fetch('keypair')}.pem")
-              keypair = "~/#{server_info.fetch('keypair')}.pem"
-            elsif File.exist?("~/.ssh/#{server_info.fetch('keypair')}.pem")
-              keypair = "~/.ssh/#{server_info.fetch('keypair')}.pem"
-            else
-              error("Cannot find PEM file specified.")
-            end
 
+          keypair = nil
+          password = nil
+          if File.exist?("./#{config[:cloudstack_ssh_keypair_name]}.pem")
+            keypair = "./#{config[:cloudstack_ssh_keypair_name]}.pem"
+          elsif File.exist?("~/#{config[:cloudstack_ssh_keypair_name]}.pem")
+            keypair = "~/#{config[:cloudstack_ssh_keypair_name]}.pem"
+          elsif File.exist?("~/.ssh/#{config[:cloudstack_ssh_keypair_name]}.pem")
+            keypair = "~/.ssh/#{config[:cloudstack_ssh_keypair_name]}.pem"
+          elsif (!config[:cloudstack_ssh_keypair_name].nil?)
+            info("Keypair specified but not found. Using password if enabled.")
+          end
+
+          # debug("Keypair is #{keypair}")
+          state[:hostname] = server_info.fetch('nic').first.fetch('ipaddress')
+
+          if (!keypair.nil?)
+            info("SSH for #{state[:hostname]} with keypair #{config[:cloudstack_ssh_keypair_name]}.")
             ssh = Fog::SSH.new(state[:hostname], config[:username], {:keys => keypair})
             debug(state[:hostname])
             debug(config[:username])
             debug(keypair)
             deploy_private_key(state[:hostname], ssh)
-          elsif (server_info.fetch('keypair').nil? && server_info.fetch('passwordenabled') == true)
-              password = server_info.fetch('password')
-              state[:hostname] = server_info.fetch('nic').first.fetch('ipaddress')
-              # Print out IP and password so you can record it if you want.
-              info("Password for #{config[:username]} at #{state[:hostname]} is #{password}")
-              ssh = Fog::SSH.new(state[:hostname], config[:username], {:password => password})
-              debug(state[:hostname])
-              debug(config[:username])
-              debug(password)
-              deploy_private_key(state[:hostname], ssh)
-          elsif (server_info.fetch('keypair').nil? && server_info.fetch('passwordenabled') == false)
-            state[:hostname] = server_info.fetch('nic').first.fetch('ipaddress')
-            info("No SSH key specified nor is this a password enabled template. You will have to manually copy your SSH public key to #{state[:hostname]} to use this Kitchen.")
+          elsif (server_info.fetch('passwordenabled') == true)
+            password = server_info.fetch('password')
+            # Print out IP and password so you can record it if you want.
+            info("Password for #{config[:username]} at #{state[:hostname]} is #{password}")
+            ssh = Fog::SSH.new(state[:hostname], config[:username], {:password => password})
+            debug(state[:hostname])
+            debug(config[:username])
+            debug(password)
+            deploy_private_key(state[:hostname], ssh)
+          else
+            info("No keypair specified (or file not found) nor is this a password enabled template. You will have to manually copy your SSH public key to #{state[:hostname]} to use this Kitchen.")
           end
         end
       end
@@ -159,7 +159,6 @@ module Kitchen
         readable = IO.select([tcp_socket], nil, nil, 5)
         if readable
           debug("\nsshd accepting connections on #{hostname}, banner is #{tcp_socket.gets}\n")
-          yield
           true
         else
           false
@@ -188,9 +187,9 @@ module Kitchen
         tcp_test_ssh(hostname)
         sync_time = 45
         if (config[:cloudstack_sync_time])
-          debug("Setting sync time to #{config[:cloudstack_sync_time]}")
           sync_time = config[:cloudstack_sync_time]
         end
+        debug("Sync time is #{sync_time}")
         if !(config[:public_key_path].nil?)
           pub_key = open(config[:public_key_path]).read
           # Wait a few moments for the OS to run the cloud-setup-password scripts
@@ -202,7 +201,6 @@ module Kitchen
 
         end
       end
-
     end
   end
 end

data/lib/kitchen/driver/cloudstack_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for Cloudstack Kitchen driver
-    CLOUDSTACK_VERSION = "0.1.1"
+    CLOUDSTACK_VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-cloudstack
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A Test Kitchen Driver for Cloudstack