kitchen-cloudstack 0.20.0 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8802c8afb4661a3cb83987810521ea0c7199bc6d
-  data.tar.gz: 2e58b407b35852838f289e359c734f50bc08d7e1
+  metadata.gz: 758e5350018113d188414f28183b77a6de93f635
+  data.tar.gz: 09226f0d77004c890c7c46a3f5a52807a93348f0
 SHA512:
-  metadata.gz: df2b0ea6265d1b658424efcf32277d8d4be1f4d6384f80bed3a339bc51003d3e58e0355266b1dfb009720feea4211ea272a8bf8b1b6ade9cbc339be709abc597
-  data.tar.gz: 81b6f19798b6b8baa26cc79092cb5892c60387e40a2744f811850f06b174841959fe7b2b9555a9b1f3ee0f530d9c9f3476aab81c91f21fd537458bfab206f1c6
+  metadata.gz: d55f09ce5c054f272a3d63038d98c1be2b19257ed9d54b89365b9a5cc50472a3298647162dd51db1c0d01c9052124212e01ef132d47e24e119bb3f62531b3291
+  data.tar.gz: 133a064deb67f9114fe0d37bcb56b3859d1ea67a12f4f531d4cac88a8d694456d12f9bc457a4b87d4fb2bca79094b94e1e743f718b0aaac1169dfe2177e684eb

data/lib/kitchen/driver/cloudstack.rb

@@ -115,6 +115,7 @@ module Kitchen
         if server_start['queryasyncjobresultresponse'].fetch('jobstatus').to_i == 2
           errortext = server_start['queryasyncjobresultresponse'].fetch('jobresult').fetch('errortext')
           error("ERROR! Job failed with #{errortext}")
+          raise ActionFailed, "Could not create server #{errortext}"
         end
 
         # jobstatus of 1 is a succesfully completed async job
@@ -144,9 +145,6 @@ module Kitchen
           # binding.pry
           # debug("Keypair is #{keypair}")
           state[:hostname] = config[:cloudstack_vm_public_ip] || server_info.fetch('nic').first.fetch('ipaddress')
-          wait_for_sshd(state[:hostname])
-          
-          debug("SSH Connectivity Validated.")
 
           if (!keypair.nil?)
             debug("Using keypair: #{keypair}")
@@ -155,16 +153,28 @@ module Kitchen
             if ssh_key.split[0] == "ssh-rsa" or ssh_key.split[0] == "ssh-dsa"
               error("SSH key #{keypair} is not a Private Key. Please modify your .kitchen.yml")
             end
+
+            wait_for_sshd(state[:hostname], config[:username], {:keys => keypair})
+            debug("SSH connectivity validated with keypair.")
+
             ssh = Fog::SSH.new(state[:hostname], config[:username], {:keys => keypair})
             debug("Connecting to : #{state[:hostname]} as #{config[:username]} using keypair #{keypair}.")
           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}")
+
+            wait_for_sshd(state[:hostname], config[:username], {:password => password})
+            debug("SSH connectivity validated with cloudstack-set password.")
+
             ssh = Fog::SSH.new(state[:hostname], config[:username], {:password => password})
             debug("Connecting to : #{state[:hostname]} as #{config[:username]} using password #{password}.")
           elsif (!config[:password].nil?)
             info("Connecting with user #{config[:username]} with password #{config[:password]}")
+
+            wait_for_sshd(state[:hostname], config[:username], {:password => config[:password]})
+            debug("SSH connectivity validated with fixed password.")
+
             ssh = Fog::SSH.new(state[:hostname], config[:username], {:password => config[:password]})
           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.")
@@ -218,7 +228,7 @@ module Kitchen
           sleep 15
           false
         ensure
-          sync_time = 45
+          sync_time = 0
           if (config[:cloudstack_sync_time])
             sync_time = config[:cloudstack_sync_time]
           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.20.0"
+    CLOUDSTACK_VERSION = "0.20.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-cloudstack
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.1
 platform: ruby
 authors:
 - Jeff Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Provides an interface for Test Kitchen to be able to run jobs against an