kitchen-cloudstack 0.1.0 → 0.1.1

data/README.md

@@ -21,6 +21,8 @@ Provide, at a minimum, the required driver options in your `.kitchen.yml` file:
       cloudstack_secret_key: [YOUR CLOUDSTACK SECRET KEY]
       cloudstack_api_url: [YOUR CLOUDSTACK API URL]
       require_chef_omnibus: latest (if you'll be using Chef)
+    OPTIONAL
+      cloudstack_sync_time: [NUMBER OF SECONDS TO WAIT FOR CLOUD-SET-GUEST-PASSWORD/SSHKEY]
 
 Then to specify different OS templates,
 
@@ -32,6 +34,8 @@ Then to specify different OS templates,
       cloudstack_security_group_id: [SECURITY GROUP ID FOR SHARED NETWORKS]
     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.
 
 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

@@ -89,7 +89,7 @@ module Kitchen
         debug("Job ID #{jobid}")
         server_start = compute.query_async_job_result('jobid'=>jobid)
         while server_start['queryasyncjobresultresponse'].fetch('jobstatus') == 0
-          print "."
+          print ". "
           sleep(10)
           server_start = compute.query_async_job_result('jobid'=>jobid)
           debug("Server_Start: #{server_start} \n")
@@ -102,31 +102,44 @@ module Kitchen
         if server_start['queryasyncjobresultresponse'].fetch('jobstatus') == 1
           server_info = server_start['queryasyncjobresultresponse']['jobresult']['virtualmachine']
           debug(server_info)
-          puts "\n(server ready)"
-          if (server_info.fetch('passwordenabled') == true)
+          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
+
+            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)
-              tcp_test_ssh(state[:hostname])
-# Installing SSH keys is consistently failing. Not sure why.
-               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-sshkey/password scripts
-                sleep(30)
-                ssh.run([
-                          %{mkdir .ssh},
-                          %{echo "#{pub_key}" >> ~/.ssh/authorized_keys}
-                      ])
-              end
-              info("(ssh ready)")
+              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.")
           end
-
         end
-
       end
 
       def destroy(state)
@@ -140,7 +153,8 @@ module Kitchen
       end
 
       def tcp_test_ssh(hostname)
-        print(".")
+        # Ripped unceremoniously from knife-cloudstack-fog as I was having issues with the wait_for_sshd() function.
+        print(". ")
         tcp_socket = TCPSocket.new(hostname, 22)
         readable = IO.select([tcp_socket], nil, nil, 5)
         if readable
@@ -169,6 +183,26 @@ module Kitchen
         tcp_socket && tcp_socket.close
       end
 
+      def deploy_private_key(hostname, ssh)
+        debug("Deploying private key to #{hostname} using connection #{ssh}")
+        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
+        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
+          sleep(sync_time)
+          ssh.run([
+                      %{mkdir .ssh},
+                      %{echo "#{pub_key}" >> ~/.ssh/authorized_keys}
+                  ])
+
+        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.0"
+    CLOUDSTACK_VERSION = "0.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-cloudstack
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen