kitchen-cloudstack 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20f6e6e8215c1e0ce64e7d5a78798c8e9c1135bc
-  data.tar.gz: 3babb8874f9944d489efe6b994fbcd8d793d73b2
+  metadata.gz: c8040fde05ddb78c105dcde532e513609778f21c
+  data.tar.gz: 4026c35590d771c985f69282d31a0913af1e46f5
 SHA512:
-  metadata.gz: 6bfcc0b18e01c7227aeafda51a83ab3ae91465c945affb7f8c9f5b6d38d590f78f0bf430aa9c5e5b33f74c629fedb4b0d7755926611766433cb9dc3570d38972
-  data.tar.gz: 07afdce65f0cf8652e63e3d116eeadf9ef8f3c45e064613df36dcd71615777cd2fa37ac3b6d28afebfe3c8255de9d4f5c8fcc6ca20b6290193c6deb41870affd
+  metadata.gz: eb0259abafb6e674cec30e039d5b21c381f53ce04a1f19969791c9ee23becce992d4d0764faad15bf9e9b73e4abd110bc38d124b097ede7fcd21380b08220e4a
+  data.tar.gz: e0a1d0c94393570a6b8d487fc0f357297af5cc82a9140a6679d767081a20bc2e72c1ac4697d9aa1376e493ba4db7274acba37603a4fca8aa284e8ff7f08a00e7

data/README.md

@@ -24,6 +24,7 @@ Provide, at a minimum, the required driver options in your `.kitchen.yml` file:
     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]
+      cloudstack_vm_public_ip: [PUBLIC_IP] # In case you use advanced networking and do static NAT manually.
 
 Then to specify different OS templates,
 
@@ -40,7 +41,8 @@ To use the CloudStack public key provider, you need to have the .PEM file locate
 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").
+"TestKey.pem"). 
+This PEM file should be the PRIVATE key, not the PUBLIC key.
 
 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):
@@ -96,8 +98,8 @@ Apache 2.0 (see [LICENSE][license])
 
 
 [author]:           https://github.com/fifthecho
-[issues]:           https://github.com/fifthecho/kitchen-cloudstack/issues
-[license]:          https://github.com/fifthecho/kitchen-cloudstack/blob/master/LICENSE
-[repo]:             https://github.com/fifthecho/kitchen-cloudstack
+[issues]:           https://github.com/test-kitchen/kitchen-cloudstack/issues
+[license]:          https://github.com/test-kitchen/kitchen-cloudstack/blob/master/LICENSE
+[repo]:             https://github.com/test-kitchen/kitchen-cloudstack
 [driver_usage]:     http://docs.kitchen-ci.org/drivers/usage
-[chef_omnibus_dl]:  http://www.opscode.com/chef/install/
+[chef_omnibus_dl]:  http://getchef.com/chef/install/

data/kitchen-cloudstack.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |spec|
   spec.version       = Kitchen::Driver::CLOUDSTACK_VERSION
   spec.authors       = ['Jeff Moody']
   spec.email         = ['fifthecho@gmail.com']
-  spec.description   = %q{A Test Kitchen Driver for Cloudstack}
-  spec.summary       = spec.description
-  spec.homepage      = 'https://github.com/fifthecho/kitchen-cloudstack'
+  spec.description   = %q{A Test Kitchen Driver for Apache CloudStack}
+  spec.summary       = %q{Provides an interface for Test Kitchen to be able to run jobs against an Apache CloudStack cloud.}
+  spec.homepage      = 'https://github.com/test-kitchen/kitchen-cloudstack'
   spec.license       = 'Apache 2.0'
 
   spec.files         = `git ls-files`.split($/)
@@ -18,15 +18,14 @@ 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'
-  spec.add_dependency 'fog', ">=1.15.0"
-  spec.add_dependency 'net-ssh-multi'
+  spec.add_dependency 'test-kitchen', '~> 1.0', '>= 1.0.0'
+  spec.add_dependency 'fog', '~> 1.23', '>= 1.23.0'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rake', '~> 0'
 
-  spec.add_development_dependency 'cane'
-  spec.add_development_dependency 'tailor'
-  spec.add_development_dependency 'countloc'
-  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'cane', '~> 0'
+  spec.add_development_dependency 'tailor', '~> 0'
+  spec.add_development_dependency 'countloc', '~> 0'
+  spec.add_development_dependency 'pry', '~> 0'
 end

data/lib/kitchen/driver/cloudstack.rb

@@ -20,7 +20,7 @@ require 'benchmark'
 require 'kitchen'
 require 'fog'
 require 'socket'
-require 'net/ssh/multi'
+require 'openssl'
 # require 'pry'
 
 module Kitchen
@@ -51,10 +51,7 @@ module Kitchen
       def create_server
         options = {}
         config[:server_name] ||= generate_name(instance.name)
-        options['zoneid'] = config[:cloudstack_zone_id]
-        options['templateid'] = config[:cloudstack_template_id]
         options['displayname'] = config[:server_name]
-        options['serviceofferingid'] = config[:cloudstack_serviceoffering_id]
         if (!config[:cloudstack_network_id].nil?)
           options['networkids'] = config[:cloudstack_network_id]
         end
@@ -69,7 +66,8 @@ module Kitchen
 
         debug(options)
         # binding.pry
-        compute.deploy_virtual_machine(options)
+        compute.deploy_virtual_machine(config[:cloudstack_serviceoffering_id], 
+          config[:cloudstack_template_id], config[:cloudstack_zone_id], options)
       end
 
       def create(state)
@@ -83,6 +81,7 @@ module Kitchen
           Excon.defaults[:ssl_verify_peer] = false
         end
 
+        
         server = create_server
         debug(server)
 
@@ -91,11 +90,11 @@ module Kitchen
         info("CloudStack instance <#{state[:server_id]}> created.")
         debug("Job ID #{jobid}")
 
-        server_start = compute.query_async_job_result('jobid'=>jobid)
+        server_start = compute.query_async_job_result(jobid)
         while server_start['queryasyncjobresultresponse'].fetch('jobstatus') == 0
           print ". "
           sleep(10)
-          server_start = compute.query_async_job_result('jobid'=>jobid)
+          server_start = compute.query_async_job_result(jobid)
         end
         debug("Server_Start: #{server_start} \n")
 
@@ -114,41 +113,50 @@ module Kitchen
           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}")
           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"
-          elsif File.exist?("~/.ssh/#{config[:cloudstack_ssh_keypair_name]}.pem")
-            keypair = "~/.ssh/#{config[:cloudstack_ssh_keypair_name]}.pem"
+            debug("Keypair being used is #{keypair}")
+          elsif File.exist?("#{ENV["HOME"]}/#{config[:cloudstack_ssh_keypair_name]}.pem")
+            keypair = "#{ENV["HOME"]}/#{config[:cloudstack_ssh_keypair_name]}.pem"
+            debug("Keypair being used is #{keypair}")
+          elsif File.exist?("#{ENV["HOME"]}/.ssh/#{config[:cloudstack_ssh_keypair_name]}.pem")
+            keypair = "#{ENV["HOME"]}/.ssh/#{config[:cloudstack_ssh_keypair_name]}.pem"
+            debug("Keypair being used is #{keypair}")
           elsif (!config[:cloudstack_ssh_keypair_name].nil?)
             info("Keypair specified but not found. Using password if enabled.")
           end
 
+          # binding.pry
           # debug("Keypair is #{keypair}")
-          state[:hostname] = server_info.fetch('nic').first.fetch('ipaddress')
-          tcp_test_ssh(state[:hostname])
+          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}")
             info("SSH for #{state[:hostname]} with keypair #{config[:cloudstack_ssh_keypair_name]}.")
+            ssh_key = File.read(keypair)
+            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
             ssh = Fog::SSH.new(state[:hostname], config[:username], {:keys => keypair})
-            debug(state[:hostname])
-            debug(config[:username])
-            debug(keypair)
-            deploy_private_key(state[:hostname], ssh)
+            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}")
             ssh = Fog::SSH.new(state[:hostname], config[:username], {:password => password})
-            debug(state[:hostname])
-            debug(config[:username])
-            debug(password)
-            deploy_private_key(state[:hostname], ssh)
+            debug("Connecting to : #{state[:hostname]} as #{config[:username]} using password #{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
+          # binding.pry
+
+          validate_ssh_connectivity(ssh)
+
+          deploy_private_key(ssh)
         end
       end
 
@@ -156,62 +164,65 @@ module Kitchen
         return if state[:server_id].nil?
 
         server = compute.servers.get(state[:server_id])
-        server.destroy unless server.nil?
+        compute.destroy_virtual_machine(state[:server_id]) unless server.nil?
         info("CloudStack instance <#{state[:server_id]}> destroyed.")
         state.delete(:server_id)
         state.delete(:hostname)
       end
 
-      def tcp_test_ssh(hostname)
-        # 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
-          debug("\nsshd accepting connections on #{hostname}, banner is #{tcp_socket.gets}\n")
-          true
-        else
+      def validate_ssh_connectivity(ssh)
+        rescue Errno::ETIMEDOUT
+          debug("SSH connection timed out. Retrying.")
+          sleep 2
           false
-        end
-
-      rescue Errno::ETIMEDOUT
-        sleep 2
-        false
-      rescue Errno::EPERM
-        false
-      rescue Errno::ECONNREFUSED
-        sleep 2
-        false
-      rescue Errno::EHOSTUNREACH
-        sleep 2
-        false
-      rescue Errno::ENETUNREACH
-        sleep 30
-        false
-      rescue Net::SSH::Disconnect
-        sleep 15
-        false
-      ensure
-        tcp_socket && tcp_socket.close
+        rescue Errno::EPERM
+          debug("SSH connection returned error. Retrying.")
+          false
+        rescue Errno::ECONNREFUSED
+          debug("SSH connection returned connection refused. Retrying.")
+          sleep 2
+          false
+        rescue Errno::EHOSTUNREACH
+          debug("SSH connection returned host unreachable. Retrying.")
+          sleep 2
+          false
+        rescue Errno::ENETUNREACH
+          debug("SSH connection returned network unreachable. Retrying.")
+          sleep 30
+          false
+        rescue Net::SSH::Disconnect
+          debug("SSH connection has been disconnected. Retrying.")
+          sleep 15
+          false
+        rescue Net::SSH::AuthenticationFailed
+          debug("SSH authentication has failed. Password or Keys may not be in place yet. Retrying.")
+          sleep 15
+          false
+        ensure
+          sync_time = 45
+          if (config[:cloudstack_sync_time])
+            sync_time = config[:cloudstack_sync_time]
+          end
+          sleep(sync_time)
+          debug("Connecting to host and running ls")
+          ssh.run('ls')
       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])
-          sync_time = config[:cloudstack_sync_time]
+      def deploy_private_key(ssh)
+        debug("Deploying user private key to server using connection #{ssh} to guarantee connectivity.")
+        if File.exist?("#{ENV["HOME"]}/.ssh/id_rsa.pub")
+          user_public_key = File.read("#{ENV["HOME"]}/.ssh/id_rsa.pub")
+        elsif File.exist?("#{ENV["HOME"]}/.ssh/id_dsa.pub")
+          user_public_key = File.read("#{ENV["HOME"]}/.ssh/id_dsa.pub")
+        else
+          debug("No public SSH key for user. Skipping.")
         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
-          sleep(sync_time)
+
+        if user_public_key
           ssh.run([
                       %{mkdir .ssh},
-                      %{echo "#{pub_key}" >> ~/.ssh/authorized_keys}
+                      %{echo "#{user_public_key}" >> ~/.ssh/authorized_keys}
                   ])
-
         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.9.2"
+    CLOUDSTACK_VERSION = "0.10.0"
   end
 end

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-cloudstack
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Jeff Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -28,30 +34,22 @@ dependencies:
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.15.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
-- !ruby/object:Gem::Dependency
-  name: net-ssh-multi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+        version: '1.23'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.23'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.23.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,73 +68,73 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tailor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: countloc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-description: A Test Kitchen Driver for Cloudstack
+description: A Test Kitchen Driver for Apache CloudStack
 email:
 - fifthecho@gmail.com
 executables: []
@@ -155,7 +153,7 @@ files:
 - kitchen-cloudstack.gemspec
 - lib/kitchen/driver/cloudstack.rb
 - lib/kitchen/driver/cloudstack_version.rb
-homepage: https://github.com/fifthecho/kitchen-cloudstack
+homepage: https://github.com/test-kitchen/kitchen-cloudstack
 licenses:
 - Apache 2.0
 metadata: {}
@@ -175,8 +173,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: A Test Kitchen Driver for Cloudstack
+summary: Provides an interface for Test Kitchen to be able to run jobs against an
+  Apache CloudStack cloud.
 test_files: []
+has_rdoc: