chef-metal-fogsphere 0.1.0.alpha.21 → 0.1.0.alpha.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38ae8a989198a560a68a05ba43cadd4fd489293c
-  data.tar.gz: d398083a720bd5cd3b7b2c9ca4c64144b878aed6
+  metadata.gz: 1a04b4d5b99f487e81e29536de6db84d5989adf4
+  data.tar.gz: c19589c8c603c8d65829633e956dd874088b32d4
 SHA512:
-  metadata.gz: 3977538dba50e11f128858b57cfafdcb1516d38c5b4fcc62797e7f488f5f52f2a0fd3b5dabc0bd2bdce5449e5706b0e7f8c09e645960f90b55df0690917f162b
-  data.tar.gz: 41ae9ebd835f75c2df6b1e73e770987807c033ab59293ca475f298c650f3a2ef9071162947ab480eaee4e5ba35a087b24a85d5c6faf16925a35e6087e94273d3
+  metadata.gz: fdfd40b3a4e93578ad6972720a6c5a3520223ab71682e62e82204103944dc7a0e8e6b71e6d9e4f7734645ad3ed3c6de88b81ef708b558e6aaec1fb2a46fe0504
+  data.tar.gz: b3420036f69e14f9e9a00e0aba754edd44fde66e363fd79f144c2eb26d4226915aef87d6460919b7d02fb574b7554126a349c9f1bfc33aa8d5f50af773700b5a

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.21'
+  gem.version       = '0.1.0.alpha.22'
   gem.license       = 'Apache 2.0'
   gem.authors       = ["Matt Wrock"]
   gem.email         = ["matt@centurylinkcloud.com"]

data/lib/clc_driver.rb

@@ -32,10 +32,19 @@ module ChefMetalVsphere
     end
 
     def self.compute_options_for(id, config)
-      compute_options = { :provider => 'vsphere', :vsphere_server => id}
-      config = { :driver_options => { :compute_options => compute_options }.merge(config)}
-
-      [ config, id ]
+      driver_options = config[:driver_options] || {}
+      compute_options = driver_options[:compute_options] || {}
+      new_compute_options = {}
+      new_compute_options[:provider] = 'vsphere'
+      new_compute_options[:vphere_server] = id
+      new_config = { :driver_options => { :compute_options => new_compute_options }}
+      new_defaults = {
+                       :driver_options => { :compute_options => {} },
+                       :machine_options => { :bootstrap_options => {} }
+                     }
+      result = Cheffish::MergedConfig.new(new_config, config, new_defaults)
+
+      [ result, id ]
     end
 
     # Create a new fog provisioner.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal-fogsphere
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha.21
+  version: 0.1.0.alpha.22
 platform: ruby
 authors:
 - Matt Wrock