chef-metal-fogsphere 0.1.0.alpha.4 → 0.1.0.alpha.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bded9aeef55e520b6ba1327ca33e5eb587e6a7e3
-  data.tar.gz: fa4cb785cbea11310642c04dced35248a907a27e
+  metadata.gz: 1e683437490c117a42fb58d691f92f1582002be6
+  data.tar.gz: 4b335f60a06db7037743a58429328ee6e011e200
 SHA512:
-  metadata.gz: c7090eb59674a2d1d143ad954d5768db3b560a59a5c5fff298d13f5608a8f37b89139561a3f612a574e5ed267239c5e28fc8d08d1677c8ad38849923301c22be
-  data.tar.gz: e27dd63106852b395ca304b5e43b0eba66f2de0cbcb83d71eed7592cc27f2d47af725f3ec713503059a85dc0ed5046f23580f442bd6d05d6a9648ef5efd38cac
+  metadata.gz: 4cc191222b12b651189d55de1762ca2aa852f330d8c47acf2ebe2f4afce10316416dfca2f23f6ceca8c4898c94290991d87d41def1d44bec0319c2930d3acd79
+  data.tar.gz: 5a2b7d86bc4b7d410e891ad1a7303a7416f0cf07f102f9d5be4ca51c11960e7948cf650e74187d8cf2b54afcb27910e7a5ab0cccea6d0bd2d339e43d1ab3d089

data/chef-metal-fogsphere.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "chef-metal-fogsphere"
-  gem.version       = '0.1.0.alpha.4'
+  gem.version       = '0.1.0.alpha.5'
   gem.license       = 'Apache 2.0'
   gem.authors       = ["Matt Wrock"]
   gem.email         = ["matt@centurylinkcloud.com"]
@@ -16,5 +16,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'rbvmomi', '~> 1.5.1'
-  gem.add_dependency 'chef-metal', '0.11.beta.2'
+  gem.add_dependency 'clc-fork-chef-metal', '0.11.beta.5'
 end

data/lib/clc_driver.rb

@@ -3,6 +3,7 @@ require 'chef_metal/machine/windows_machine'
 require 'chef_metal/machine/unix_machine'
 require 'chef_metal/convergence_strategy/install_msi'
 require 'chef_metal/convergence_strategy/install_cached'
+require 'chef_metal/convergence_strategy/no_converge'
 require 'chef_metal/transport/ssh'
 require 'fog'
 require 'fog/core'
@@ -21,7 +22,7 @@ module ChefMetalVsphere
     } unless defined? DEFAULT_OPTIONS
 
     def self.from_url(driver_url, config)
-      id = driver_url.split(':')[2]
+      id = driver_url.split(':')[1]
       config, id = compute_options_for(id, config)
       VsphereDriver.new("vsphere:#{id}", config)
     end
@@ -59,14 +60,11 @@ module ChefMetalVsphere
     #   - :start_timeout - the time to wait for the instance to start (defaults to 600)
     def initialize(driver_url, config)
       super(driver_url, config)
-    end
-
-    def compute_options
-      driver_options[:compute_options] || {}
+      @compute_options = config[:driver_options][:compute_options]
     end
 
     def provider
-      compute_options[:provider]
+      @compute_options[:provider]
     end
 
     # Inflate a provisioner from node_json information; we don't want to force the
@@ -123,7 +121,7 @@ module ChefMetalVsphere
     def allocate_machine(action_handler, machine_spec, machine_options)
       if machine_spec.location
         if machine_spec.location['driver_url'] != driver_url
-          raise "Switching a machine's driver from #{machine_spec.location['driver_url']} to #{driver_url} for is not currently supported!  Use machine :destroy and then re-create the machine on the new driver."
+          raise "Switching a machine's driver from #{machine_spec.location['driver_url']} to #{driver_url} is not currently supported!  Use machine :destroy and then re-create the machine on the new driver."
         end
 
         server = server_for(machine_spec)
@@ -178,11 +176,14 @@ module ChefMetalVsphere
       is_static = false
       bootstrap_options = bootstrap_options_for(machine_spec, machine_options)
       if has_static_ip(bootstrap_options)
-        Chef::Log.info "waiting for customizations to complete"
-        sleep(30)
-        Chef::Log.info "rebooting..."
-        server.reboot
         is_static = true
+        transport = transport_for(machine_spec, machine_options, server)
+        if !transport.available?
+          Chef::Log.info "waiting for customizations to complete"
+          sleep(30)
+          Chef::Log.info "rebooting..."
+          server.reboot
+        end
       end
 
       begin
@@ -274,7 +275,7 @@ module ChefMetalVsphere
     end
 
     def compute
-      @compute ||= Fog::Compute.new(compute_options)
+      @compute ||= Fog::Compute.new(@compute_options)
     end
 
     # Not meant to be part of public interface
@@ -347,10 +348,10 @@ module ChefMetalVsphere
     end
 
     def create_ssh_transport(machine_spec, machine_options, server)
-      username = compute_options[:ssh_username] || 'root'
+      username = @compute_options[:ssh_username] || 'root'
       bootstrap_options = bootstrap_options_for(machine_spec, machine_options)
       remote_host = has_static_ip(bootstrap_options) ? bootstrap_options[:customization_spec]['ipsettings']['ip'] : server.ipaddress
-      ChefMetal::Transport::SSH.new(remote_host, username, {:password => compute_options[:ssh_password], :paranoid => false}, {}, config)
+      ChefMetal::Transport::SSH.new(remote_host, username, {:password => @compute_options[:ssh_password], :paranoid => false}, {}, config)
     end
 
     def wait_for_transport(action_handler, machine_spec, machine_options, server)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal-fogsphere
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha.4
+  version: 0.1.0.alpha.5
 platform: ruby
 authors:
 - Matt Wrock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbvmomi
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
-  name: chef-metal
+  name: clc-fork-chef-metal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.beta.2
+        version: 0.11.beta.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.beta.2
+        version: 0.11.beta.5
 description: A fork of Chef-Metal-fog for vsphere
 email:
 - matt@centurylinkcloud.com