chef-provisioning-vsphere 0.7.0 → 0.7.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 447c1e20f65a8624c0321e979bd167d749bfdc99
4
- data.tar.gz: 0d2642fb145e478ed4bb941463ac918eae3b5e3d
3
+ metadata.gz: 9637b94190bc6567be41105befc9b4da2692600b
4
+ data.tar.gz: dff451ef2bfa5b08d7e9700480efe5eb9707abd9
5
5
  SHA512:
6
- metadata.gz: 819875ac593906e1d8570f823471d05747baa54ef9689086de8aee21cc093c7df87cee7835618590b8a585d87ba764028a7d96fc8e2f69559be8fceea4825d96
7
- data.tar.gz: 702b9dcd0d2c953cd5034a03ae70e6706c48eb58af12076b8c10ba32e6b2fc5ee5debaa376081e664d7c2bb64f0504968b43d7670fc6247cec98b2d8431e89c5
6
+ metadata.gz: c319ff6dd39c955334686e67ae8c6d84c1c2bd6c73d9e7ab3572f3c9a6936a917c1e6e76e9cbf5ad3dab9d1e86e2796eb7d8e0eb52285cc2b51983d6a24cdbf2
7
+ data.tar.gz: 3dbb4555cc14799b0be798614945f27c5b42fc380f9bc2eb7759068901e0e121a0171cc6ace9906c89168d6121514f559284777a91e765b9cc5a67f7984acd28
@@ -86,7 +86,8 @@ module ChefProvisioningVsphere
86
86
 
87
87
  def customization_options_from(vm_template, vm_name, options)
88
88
  if options.has_key?(:customization_spec)
89
- if(options[:customization_spec].is_a?(Hash))
89
+ if options[:customization_spec].is_a?(Hash) ||
90
+ options[:customization_spec].is_a?(Cheffish::MergedConfig)
90
91
  cust_options = options[:customization_spec]
91
92
  ip_settings = cust_options[:ipsettings]
92
93
  cust_domain = cust_options[:domain]
@@ -198,4 +199,4 @@ module ChefProvisioningVsphere
198
199
  :userData => cust_userdata)
199
200
  end
200
201
  end
201
- end
202
+ end
@@ -1,3 +1,3 @@
1
1
  module ChefProvisioningVsphere
2
- VERSION = '0.7.0'
2
+ VERSION = '0.7.1'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: chef-provisioning-vsphere
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.0
4
+ version: 0.7.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - CenturyLink Cloud
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-07-21 00:00:00.000000000 Z
11
+ date: 2015-07-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rbvmomi