chef-metal-fog 0.5.beta.4 → 0.5.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 556f2267637c64664e9ca20e8f1ace0925aa7d09
-  data.tar.gz: 5f766e9bb22d737259f91befc928cc06f5949d6d
+  metadata.gz: 8d322a0449ade9efef2687f008518e7ac83d1e7d
+  data.tar.gz: 7bd6f1bb30ac76cd48fda57143345225db5de2ad
 SHA512:
-  metadata.gz: c61a6f316a804d10b6fd25662d1fb27a947f0019ad5e972cdbb068a963ed760ba5f0dda0b8c5f58a7538392c4d252a0e3605385ece9199d482e70ecd1f3e32b4
-  data.tar.gz: 077e42b78f89ea339741257099dd5d10c0b7dc2b8a7a7e5b28499eb868a7fa2f3c489a8573bcee322da56391a160aa3c990ab7767866171f5c9481100770d98a
+  metadata.gz: 7de8f96cd3532800eb4b8f75624c689586d6c9dbbfceef3ba7491974d70fb854478ff3849e4a76fe8323d9700152ec6674e17eefe49a265684baf06cc0667d48
+  data.tar.gz: df850e30c2f46a531d3b735c5aecdc8b9a3b2ce79245d321544dc0e290cbb9f551fc5a9603367669fd5f8f2d764f4b1c1253810ab1e07fde1424e95930a34640

data/lib/chef_metal_fog/fog_driver.rb

@@ -466,7 +466,7 @@ module ChefMetalFog
       if machine_spec.location['is_windows']
         ChefMetal::Machine::WindowsMachine.new(machine_spec, transport_for(machine_spec, machine_options, server), convergence_strategy_for(machine_spec, machine_options))
       else
-        ChefMetal::Machine::UnixMachine.new(machine_spec, transport_for(machine_spec, machine_optins, server), convergence_strategy_for(machine_spec, machine_options))
+        ChefMetal::Machine::UnixMachine.new(machine_spec, transport_for(machine_spec, machine_options, server), convergence_strategy_for(machine_spec, machine_options))
       end
     end
 
@@ -546,6 +546,7 @@ module ChefMetalFog
       new_compute_options = {}
       new_compute_options[:provider] = provider
       new_config = { :driver_options => { :compute_options => new_compute_options }}
+      config = Cheffish::MergedConfig.new(new_config, config)
 
       # Get data from the identifier in the URL
       if id && id != ''
@@ -610,8 +611,6 @@ module ChefMetalFog
         new_compute_options[:rackspace_compute_url] ||= credential[:rackspace_compute_url]
       end
 
-      config = Cheffish::MergedConfig.new(new_config, config)
-
       id = case provider
         when 'AWS'
           account_info = FogDriverAWS.aws_account_info_for(config[:driver_options][:compute_options])

data/lib/chef_metal_fog/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalFog
-  VERSION = '0.5.beta.4'
+  VERSION = '0.5.beta.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal-fog
 version: !ruby/object:Gem::Version
-  version: 0.5.beta.4
+  version: 0.5.beta.5
 platform: ruby
 authors:
 - John Keiser