kitchen-cloudstack 0.20.0.pre → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 525485d2f200010310f1cd4777a9422ceedd95cd
-  data.tar.gz: 8d965420f5a495fcd57575774ec51f91f1149784
+  metadata.gz: 8802c8afb4661a3cb83987810521ea0c7199bc6d
+  data.tar.gz: 2e58b407b35852838f289e359c734f50bc08d7e1
 SHA512:
-  metadata.gz: 2349e93da6c432786b6e04d234826b2eae069ccf808fe7febe0e62326e9defbb974dc82f4b1dc1698ed1c70b55fea550acee68f973f2214b11caec0c49ef940a
-  data.tar.gz: 175d40c760a0d10e59444d1bfd8d709e03f8492e92d945b55bba3ee63841cdc2229e23cb4e27c4afe75c0455378332e8c61e75e92f6569297f5535d0419d3a8e
+  metadata.gz: df2b0ea6265d1b658424efcf32277d8d4be1f4d6384f80bed3a339bc51003d3e58e0355266b1dfb009720feea4211ea272a8bf8b1b6ade9cbc339be709abc597
+  data.tar.gz: 81b6f19798b6b8baa26cc79092cb5892c60387e40a2744f811850f06b174841959fe7b2b9555a9b1f3ee0f530d9c9f3476aab81c91f21fd537458bfab206f1c6

data/kitchen-cloudstack.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'test-kitchen', '~> 1.0', '>= 1.0.0'
-  spec.add_dependency 'fog', '~> 1.24', '>= 1.24.0'
+  spec.add_dependency 'fog', '~> 1.23', '>= 1.23.0'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake', '~> 0'

data/lib/kitchen/driver/cloudstack.rb

@@ -34,7 +34,8 @@ module Kitchen
       default_config :name,             nil
       default_config :username,         'root'
       default_config :port,             '22'
-
+      default_config :password,         nil
+      
       def compute
         cloudstack_uri =  URI.parse(config[:cloudstack_api_url])
         connection = Fog::Compute.new(
@@ -124,7 +125,6 @@ module Kitchen
 
 
           keypair = nil
-          password = nil
           if ((!config[:keypair_search_directory].nil?) and (File.exist?("#{config[:keypair_search_directory]}/#{config[:cloudstack_ssh_keypair_name]}.pem")))
             keypair = "#{config[:keypair_search_directory]}/#{config[:cloudstack_ssh_keypair_name]}.pem"
             debug("Keypair being used is #{keypair}")
@@ -163,6 +163,9 @@ module Kitchen
             info("Password for #{config[:username]} at #{state[:hostname]} is #{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]}")
+            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.")
           end
@@ -177,8 +180,10 @@ module Kitchen
       def destroy(state)
         return if state[:server_id].nil?
         debug("Destroying #{state[:server_id]}")
-        server = compute.servers.get({'id' => state[:server_id]})
-        compute.destroy_virtual_machine({'id' => state[:server_id]}) unless server.nil?
+        server = compute.servers.get(state[:server_id])
+        if not server.nil?
+          compute.destroy_virtual_machine({'id' => state[:server_id]})
+        end
         info("CloudStack instance <#{state[:server_id]}> destroyed.")
         state.delete(:server_id)
         state.delete(:hostname)

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.pre"
+    CLOUDSTACK_VERSION = "0.20.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-cloudstack
 version: !ruby/object:Gem::Version
-  version: 0.20.0.pre
+  version: 0.20.0
 platform: ruby
 authors:
 - Jeff Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -36,20 +36,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: '1.23'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: 1.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: '1.23'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: 1.23.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -168,12 +168,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Provides an interface for Test Kitchen to be able to run jobs against an