kitchen-cloudstack 0.1.2 → 0.1.3

data/README.md

@@ -23,6 +23,7 @@ Provide, at a minimum, the required driver options in your `.kitchen.yml` file:
       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]
+      keypair_search_directory: [PATH TO DIRECTORY (other than ~, ., and ~/.ssh) WITH KEYPAIR PEM FILE]
 
 Then to specify different OS templates,
 
@@ -34,9 +35,12 @@ Then to specify different OS templates,
       cloudstack_security_group_id: [SECURITY GROUP ID FOR SHARED NETWORKS]
     OPTIONAL
       cloudstack_ssh_keypair_name: [SSH KEY NAME]
+      cloudstack_sync_time: [NUMBER OF SECONDS TO WAIT FOR CLOUD-SET-GUEST-PASSWORD/SSHKEY]
 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 home directory (~), or your .ssh directory (~/.ssh/) and it must be named the same as the
-Keypair on CloudStack suffixed with .pem.
+your .kitchen.yml file, your home directory (~), your .ssh directory (~/.ssh/), or specify a directory (without any
+trailing slahses) as your "keypair_search_directory" and the file be named the same as the Keypair on CloudStack
+suffixed with .pem (e.g. the Keypair named "TestKey" should be located in one of the searched directories and named
+"TestKey.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/kitchen-cloudstack.gemspec

@@ -18,7 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'test-kitchen', '~> 1.0.0.alpha.3'
+  spec.add_dependency 'test-kitchen', '~> 1.0.0.alpha.6'
+  spec.add_dependency 'fog', ">=1.10.1"
+  spec.add_dependency 'net-ssh-multi'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

data/lib/kitchen/driver/cloudstack.rb

@@ -54,15 +54,18 @@ module Kitchen
         options['templateid'] = config[:cloudstack_template_id]
         options['displayname'] = config[:name]
         options['serviceofferingid'] = config[:cloudstack_serviceoffering_id]
+        if (!config[:cloudstack_network_id].nil?)
+          options['networkids'] = config[:cloudstack_network_id]
+        end
+
         if (!config[:cloudstack_security_group_id].nil?)
           options['securitygroupids'] = config[:cloudstack_security_group_id]
         end
-        if (!config[:cloudstack_network_id].nil?)
-          options['networkids'] = config[:cloudstack_security_group_id]
-        end
+
         if (!config[:cloudstack_ssh_keypair_name].nil?)
           options['keypair'] = config[:cloudstack_ssh_keypair_name]
         end
+
         debug(options)
         compute.deploy_virtual_machine(options)
       end
@@ -107,7 +110,9 @@ module Kitchen
 
           keypair = nil
           password = nil
-          if File.exist?("./#{config[:cloudstack_ssh_keypair_name]}.pem")
+          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"
+          elsif 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"
@@ -121,6 +126,7 @@ module Kitchen
           state[:hostname] = server_info.fetch('nic').first.fetch('ipaddress')
 
           if (!keypair.nil?)
+            debug("Using keypair: #{keypair}")
             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])

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.2"
+    CLOUDSTACK_VERSION = "0.1.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-cloudstack
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha.3
+        version: 1.0.0.alpha.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,39 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha.3
+        version: 1.0.0.alpha.6
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.10.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.10.1
+- !ruby/object:Gem::Dependency
+  name: net-ssh-multi
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -163,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A Test Kitchen Driver for Cloudstack