clc-chef-metal-vsphere 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30ca8337aad8fb990cd2be047ae531f283da2a5a
-  data.tar.gz: e9d7037e74152546784045c3821bd96dd342008f
+  metadata.gz: fe331e4128b27e53d0c72452736f3ae651fafc44
+  data.tar.gz: b5fb62b6fd123c8348ced5067ee122d124a70d12
 SHA512:
-  metadata.gz: dc1fdc88af6f42f22d995b43e6bec397f9b1119fb01c054329b07c18101c1c1f09972a9e6ef14b51aad39da431bb50624de1063e8ecc3e1b591cdd70751ab7f1
-  data.tar.gz: 22327524c3ca5b889de9c4bfca907a9479445b384c67d5981a27989a599268223b84eeab3c220dabc1b5ad0326883f232f77611cc375a82dcd23b5e8ab1bf522
+  metadata.gz: 15973237344a53882facf5e6ffb12a7d78f18ba1e2873e3e5f67681ec93b53ab1b1e8a0d935dbcafa16dc7b410ba06a1958146132a4125ead2c3e6ba2120f268
+  data.tar.gz: fe936bf2633196eefc976c5d730e8b44d1d6380bc289bf625d56b0cec79e21e0b0c03f7d96a337515fbe0d3fd4a3122ed482d069fbd361b5086575abf61d2745

data/lib/chef_metal_vsphere/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalVsphere
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/lib/chef_metal_vsphere/vsphere_helpers.rb

@@ -164,17 +164,22 @@ module ChefMetalVsphere
       end
 
       unless options[:network_name].to_s.nil?
-        network = find_network(datacenter, options[:network_name])
-        card = vm_template.config.hardware.device.grep(RbVmomi::VIM::VirtualEthernetCard).first
-        begin
-          switch_port = RbVmomi::VIM.DistributedVirtualSwitchPortConnection(:switchUuid => network.config.distributedVirtualSwitch.uuid, :portgroupKey => network.key)
-          card.backing.port = switch_port
-        rescue
-          # not connected to a distibuted switch?
-          card.backing.deviceName = options[:network_name]
-        end
-        dev_spec = RbVmomi::VIM.VirtualDeviceConfigSpec(:device => card, :operation => "edit")
-        clone_spec.config.deviceChange.push dev_spec
+        config_spec_operation = RbVmomi::VIM::VirtualDeviceConfigSpecOperation('edit')
+        nic_backing_info = RbVmomi::VIM::VirtualEthernetCardNetworkBackingInfo(:deviceName => options[:network_name])
+        connectable = RbVmomi::VIM::VirtualDeviceConnectInfo(
+          :allowGuestControl => true,
+          :connected => true,
+          :startConnected => true)
+        device = RbVmomi::VIM::VirtualE1000(
+          :backing => nic_backing_info,
+          :deviceInfo => RbVmomi::VIM::Description(:label => "Network adapter 1", :summary => options[:network_name]),
+          :key => 4000,
+          :connectable => connectable)
+        device_spec = RbVmomi::VIM::VirtualDeviceConfigSpec(
+          :operation => config_spec_operation,
+          :device => device)
+
+        clone_spec.config.deviceChange.push device_spec
       end
 
       vm_template.CloneVM_Task(
@@ -211,11 +216,6 @@ module ChefMetalVsphere
     vm
     end
 
-    def find_network(dc, network_name)
-      baseEntity = dc.network
-      baseEntity.find { |f| f.name == network_name } or raise "no such network #{network_name}"
-    end
-
     def find_datastore(dc, datastore_name)
         baseEntity = dc.datastore
         baseEntity.find { |f| f.info.name == datastore_name } or raise "no such datastore #{datastore_name}"    

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clc-chef-metal-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef