clc-chef-metal-vsphere 0.3.48 → 0.3.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 157476da7931b4a2b69395ba7b82ff69e662e1b6
-  data.tar.gz: e7967e8c6b52b7c76ce6cb9fd77d99efa5a6d09d
+  metadata.gz: e44eddddcd63d7c14ad37e572fd362d2d056215e
+  data.tar.gz: 882e9e8d9fb68fd3191ecf9b26cce46d57231bde
 SHA512:
-  metadata.gz: 02851c06a6abe53f8aff1af8308281c8595436a6263e2c7b9b821d50ba2ecac5a99f12268966327dcc563d9ba2198547b71cb017d56a81a290899ffda80a3736
-  data.tar.gz: d089c5560bdd7a3e7e27523eea0fb1d7a581d20028178fb5185be59da2ab2704d6bb55836a959da67f1780a41fecad355fb9b5ab204df50858c5d4421c47c29d
+  metadata.gz: 266f18cbc604adc530ce38378fc56129e6b05759beef845deb6707c7f234d810de9ddd82c9364e321c3b39d16a98025b6309cbd546beab3f7df057c02340f477
+  data.tar.gz: 91da0ad2ae927d666988db6c812f34a610eff213f9f68b459aacf73dfd3c2ce29b11b8b5cf68b442ae1301b2034784f418c29c98b9095a53b485c4e628457177

data/lib/chef_metal_vsphere/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalVsphere
-  VERSION = '0.3.48'
+  VERSION = '0.3.49'
 end

data/lib/chef_metal_vsphere/vsphere_driver.rb

@@ -491,7 +491,7 @@ module ChefMetalVsphere
       require 'chef_metal/transport/winrm'
       bootstrap_options = bootstrap_options_for(machine_spec, machine_options)
       ssh_options = bootstrap_options[:ssh]
-      remote_host = ip_for(bootstrap_options, vm)
+      remote_host = machine_spec.location['ipaddress'] || ip_for(bootstrap_options, vm)
       winrm_options = {:user => "#{ssh_options[:user]}", :pass => ssh_options[:password], :basic_auth_only => true}
 
       ChefMetal::Transport::WinRM.new("http://#{remote_host}:5985/wsman", :plaintext, winrm_options, config)
@@ -502,7 +502,7 @@ module ChefMetalVsphere
       bootstrap_options = bootstrap_options_for(machine_spec, machine_options)
       ssh_options = bootstrap_options[:ssh]
       ssh_user = ssh_options[:user]
-      remote_host = ip_for(bootstrap_options, vm)
+      remote_host = machine_spec.location['ipaddress'] || ip_for(bootstrap_options, vm)
 
       ChefMetal::Transport::SSH.new(remote_host, ssh_user, ssh_options, {}, config)
     end

data/spec/integration_tests/config.rb

@@ -19,7 +19,7 @@
   		:num_cpus => 2,
   		#:network_name => ['vlan_20_172.21.20'],
   		#:network_name => ['vlan10_172.21.10-vm'],
-  		:network_name => ['vlan10_172.21.10-vm', 'vlan_20_172.21.20'],
+  		:network_name => ['vlan_20_172.21.20','vlan_74_build'],
   		:memory_mb => 4096,
   		:resource_pool => 'CLSTR02/DLAB',
   		:additional_disk_size_gb => 50,
@@ -33,13 +33,13 @@
 	  	:convergence_options => {},
         :customization_spec => {
           :ipsettings => {
-          	:ip => '172.21.10.190',
-            :subnetMask => '255.255.255.0',
-            :gateway => ["172.21.10.1"],
+          	#:ip => '172.21.20.190',
+            #:subnetMask => '255.255.255.0',
+            #:gateway => ["172.21.20.1"],
             :dnsServerList => ["192.168.64.19","192.168.64.20"]
           },
           :domain => 't3n.dom',
-          :domainAdmin => "tier3sa@t3n.dom",
+          :domainAdmin => "tier3sa",
           :domainAdminPassword => '4u2bn01!!@#$',
           :org_name => 'Tier3',
           :product_id => 'W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9',

data/spec/integration_tests/vsphere_driver_spec.rb

@@ -129,20 +129,20 @@ describe "vsphere_driver" do
 		end
     end
 
-	context "destroy_machine" do
+	# context "destroy_machine" do
 
-		it "removes the machine" do
-			Cheffish.honor_local_mode do
-				chef_server = Cheffish.default_chef_server(Cheffish.profiled_config)
-				driver = ChefMetal.driver_for_url("vsphere://#{@metal_config[:driver_options][:host]}", @metal_config)
-				action_handler = ChefMetal::ActionHandler.new
-				machine_spec = ChefMetal::ChefMachineSpec.new({'name' => @vm_name}, chef_server)
-				machine_spec.location = { 'driver_url' => driver.driver_url,
-										  'server_id' => @server_id}
-				driver.destroy_machine(action_handler, machine_spec, @metal_config[:machine_options])
-			end
-			vm = find_vm_by_id(@server_id, @connection)
-			expect(vm).to eq(nil)
-		end
-	end
+	# 	it "removes the machine" do
+	# 		Cheffish.honor_local_mode do
+	# 			chef_server = Cheffish.default_chef_server(Cheffish.profiled_config)
+	# 			driver = ChefMetal.driver_for_url("vsphere://#{@metal_config[:driver_options][:host]}", @metal_config)
+	# 			action_handler = ChefMetal::ActionHandler.new
+	# 			machine_spec = ChefMetal::ChefMachineSpec.new({'name' => @vm_name}, chef_server)
+	# 			machine_spec.location = { 'driver_url' => driver.driver_url,
+	# 									  'server_id' => @server_id}
+	# 			driver.destroy_machine(action_handler, machine_spec, @metal_config[:machine_options])
+	# 		end
+	# 		vm = find_vm_by_id(@server_id, @connection)
+	# 		expect(vm).to eq(nil)
+	# 	end
+	# end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clc-chef-metal-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.3.48
+  version: 0.3.49
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef