clc-chef-metal-vsphere 0.3.23 → 0.3.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f410895408718c56d212dc25ff9e335335a59d0
-  data.tar.gz: adf5d2c8da935f61827dccf8f382339ccc32992c
+  metadata.gz: f41902a9b6b5ce10b4454928abf90ccb06983904
+  data.tar.gz: 7900df3c1cff8fc04592213f2984de1c29926c23
 SHA512:
-  metadata.gz: e658a1fab56d10ea386eafdbc11539277ea642ee0d07f27afb640192ac3247589dcc729b6e9c032db24fb213153c12f91fc3d49324bfa111caeb17b156808a14
-  data.tar.gz: 7383c8e350d345185515f55ff3ff9b852bfbf753a4fe55606a12918c213acaedc2280ad69a6f2cf52bef6084dbddf164af8a8cf5754bc5dac61b13f5805d873b
+  metadata.gz: c1b92bd25d8c18df12af9b86950b24e07055b5f034a2d9fb32916244056758959b461469275471b393dafdee39e9fd63b09d648afe0fa1ad33b3b1ed9b62d9df
+  data.tar.gz: 7993ceabed8a0da4931f14991b9da9f470b486b0958bf697b47146f28d1f6e7717cbe1f3d02e4b796163eb907dd308f24e5cbac8a7518d89240a81f724f07b4b

data/lib/chef_metal_vsphere/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalVsphere
-  VERSION = '0.3.23'
+  VERSION = '0.3.24'
 end

data/lib/chef_metal_vsphere/vsphere_driver.rb

@@ -209,7 +209,7 @@ module ChefMetalVsphere
         action_handler.report_progress "waiting for customizations to complete and find #{vm_ip}"
         now = Time.now.utc
         until (Time.now.utc - now) > 90 || (vm.guest.net.map { |net| net.ipAddress}.flatten).include?(vm_ip) do
-          print "-"
+          puts "IP addresses on #{machine_spec.name} are #{vm.guest.net.map { |net| net.ipAddress}.flatten}"
           sleep 5
         end
         if !(vm.guest.net.map { |net| net.ipAddress}.flatten).include?(vm_ip)

data/lib/chef_metal_vsphere/vsphere_helpers.rb

@@ -238,14 +238,20 @@ module ChefMetalVsphere
         if(options[:customization_spec].is_a?(Hash))
             cust_options = options[:customization_spec]
             raise ArgumentError, "domain is required" unless cust_options.key?(:domain)
+            cust_ip_settings = nil
             if cust_options.key?(:ipsettings) and cust_options[:ipsettings].key?(:ip)
               raise ArgumentError, "ip and subnetMask is required for static ip" unless cust_options[:ipsettings].key?(:ip) and
                                                                                         cust_options[:ipsettings].key?(:subnetMask)
               cust_ip_settings = RbVmomi::VIM::CustomizationIPSettings.new(cust_options[:ipsettings])
+              puts "customizing #{vm_name} with static IP cust_options[:ipsettings][:ip]"
               cust_ip_settings.ip = RbVmomi::VIM::CustomizationFixedIp(:ipAddress => cust_options[:ipsettings][:ip])
             end
             cust_domain = cust_options[:domain]
-            cust_ip_settings ||= RbVmomi::VIM::CustomizationIPSettings.new(:ip => RbVmomi::VIM::CustomizationDhcpIpGenerator.new())
+            if cust_ip_settings.nil?
+              puts "customizing #{vm_name} with dynamic IP"
+              cust_ip_settings= RbVmomi::VIM::CustomizationIPSettings.new(:ip => RbVmomi::VIM::CustomizationDhcpIpGenerator.new())
+            end
+
             cust_ip_settings.dnsDomain = cust_domain
             cust_global_ip_settings = RbVmomi::VIM::CustomizationGlobalIPSettings.new
             cust_global_ip_settings.dnsServerList = cust_ip_settings.dnsServerList

data/spec/integration_tests/config.rb

@@ -10,16 +10,19 @@
             :create_timeout => 600, 	  	
             :bootstrap_options => {
 	  		:datacenter => 'QA1',
-	  		:template_name => 'WIN2012R2DTC-64',
+	  		:template_name => 'UBUNTU-12-64-TEMPLATE',
+	  		#:template_name => 'WIN2012R2DTC-64',
 	  		:vm_folder => 'DLAB',
 	  		:datastore => 'QA1-2-SFIRE-01',
 	  		:num_cpus => 2,
-	  		:network_name => ['vlan_20_172.21.20', 'vlan10_172.21.10-vm'],
+	  		:network_name => ['vlan_20_172.21.20'],
+	  		#:network_name => ['vlan_20_172.21.20', 'vlan10_172.21.10-vm'],
 	  		:memory_mb => 4096,
 	  		:resource_pool => 'CLSTR02/DLAB',
 	  		:additional_disk_size_gb => 50,
 		  	:ssh => {
-		  		:user => 'administrator',
+		  		:user => 'root',
+		  		#:user => 'administrator',
 		  		:password => 'Password123',
 		  		:paranoid => false,
 		  		:port => 22
@@ -41,3 +44,4 @@
 	  },
 	  :log_level => :debug
 	}
+

metadata

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