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

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1a04b4d5b99f487e81e29536de6db84d5989adf4
4
- data.tar.gz: c19589c8c603c8d65829633e956dd874088b32d4
3
+ metadata.gz: c2778b20c5c8f2ef741828a07399965ed3991bbc
4
+ data.tar.gz: 242c0c06fd82e31df846d0c76bd7ba7b9b3ebf11
5
5
  SHA512:
6
- metadata.gz: fdfd40b3a4e93578ad6972720a6c5a3520223ab71682e62e82204103944dc7a0e8e6b71e6d9e4f7734645ad3ed3c6de88b81ef708b558e6aaec1fb2a46fe0504
7
- data.tar.gz: b3420036f69e14f9e9a00e0aba754edd44fde66e363fd79f144c2eb26d4226915aef87d6460919b7d02fb574b7554126a349c9f1bfc33aa8d5f50af773700b5a
6
+ metadata.gz: 745d0a90d6650b313b635e6bface072d87e9ca9f4ee5766f9924eca4865f60f644aea004c8d6b7a38a30cfb265730b3842a93959e2ea9592d2e67354e28ca8cc
7
+ data.tar.gz: 64a6b42e7a354e3ed805c9f346428688e1cacdf52085303f0c5220d6a8bce4f56df11eeee56d7b87346f46ef02b0f5fde460fbe8d093a8f8771799f62f1102b5
@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
4
 
5
5
  Gem::Specification.new do |gem|
6
6
  gem.name = "chef-metal-fogsphere"
7
- gem.version = '0.1.0.alpha.22'
7
+ gem.version = '0.1.0.alpha.23'
8
8
  gem.license = 'Apache 2.0'
9
9
  gem.authors = ["Matt Wrock"]
10
10
  gem.email = ["matt@centurylinkcloud.com"]
@@ -32,12 +32,10 @@ module ChefMetalVsphere
32
32
  end
33
33
 
34
34
  def self.compute_options_for(id, config)
35
- driver_options = config[:driver_options] || {}
36
- compute_options = driver_options[:compute_options] || {}
37
35
  new_compute_options = {}
38
36
  new_compute_options[:provider] = 'vsphere'
39
- new_compute_options[:vphere_server] = id
40
- new_config = { :driver_options => { :compute_options => new_compute_options }}
37
+ new_compute_options[:vsphere_server] = id
38
+ new_config = { :driver_options => { :compute_options => new_compute_options.merge(config[:driver_options]) }}
41
39
  new_defaults = {
42
40
  :driver_options => { :compute_options => {} },
43
41
  :machine_options => { :bootstrap_options => {} }
@@ -63,7 +61,7 @@ module ChefMetalVsphere
63
61
  # - :start_timeout - the time to wait for the instance to start (defaults to 600)
64
62
  def initialize(driver_url, config)
65
63
  super(driver_url, config)
66
- @compute_options = config[:driver_options][:compute_options]
64
+ @compute_options = config[:driver_options][:compute_options].to_hash
67
65
  end
68
66
 
69
67
  # Inflate a provisioner from node_json information; we don't want to force the
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: chef-metal-fogsphere
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0.alpha.22
4
+ version: 0.1.0.alpha.23
5
5
  platform: ruby
6
6
  authors:
7
7
  - Matt Wrock