knife-vsphere 0.1.7 → 0.1.8

data/lib/chef/knife/vsphere_template_list.rb

@@ -1,32 +1,32 @@
-#
-# Author:: Ezra Pagel (<ezra@cpan.org>)
-# License:: Apache License, Version 2.0
-#
-
-require 'chef/knife'
-require 'chef/knife/BaseVsphereCommand'
-
-# Lists all known VM templates in the configured datacenter
-class Chef::Knife::VsphereTemplateList < Chef::Knife::BaseVsphereCommand
-
-  banner "knife vsphere template list"
-
-  get_common_options
-  
-  def run
-
-    $stdout.sync = true
-    $stderr.sync = true
-
-    vim = get_vim_connection
-
-    baseFolder = find_folder(config[:folder]);
-
-    vms = find_all_in_folder(baseFolder, RbVmomi::VIM::VirtualMachine).
-      select {|v| !v.config.nil? && v.config.template == true }
-    
-    vms.each do |vm|          
-      puts "#{ui.color("Template Name", :cyan)}: #{vm.name}"
-    end
-  end
-end
+#
+# Author:: Ezra Pagel (<ezra@cpan.org>)
+# License:: Apache License, Version 2.0
+#
+
+require 'chef/knife'
+require 'chef/knife/BaseVsphereCommand'
+
+# Lists all known VM templates in the configured datacenter
+class Chef::Knife::VsphereTemplateList < Chef::Knife::BaseVsphereCommand
+
+  banner "knife vsphere template list"
+
+  get_common_options
+  
+  def run
+
+    $stdout.sync = true
+    $stderr.sync = true
+
+    vim = get_vim_connection
+
+    baseFolder = find_folder(config[:folder]);
+
+    vms = find_all_in_folder(baseFolder, RbVmomi::VIM::VirtualMachine).
+      select {|v| !v.config.nil? && v.config.template == true }
+    
+    vms.each do |vm|          
+      puts "#{ui.color("Template Name", :cyan)}: #{vm.name}"
+    end
+  end
+end

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -1,373 +1,397 @@
-#
-# Author:: Ezra Pagel (<ezra@cpan.org>)
-# Contributor:: Jesse Campbell (<hikeit@gmail.com>)
-# License:: Apache License, Version 2.0
-#
-
-require 'chef/knife'
-require 'chef/knife/BaseVsphereCommand'
-require 'rbvmomi'
-require 'netaddr'
-
-# Clone an existing template into a new VM, optionally applying a customization specification.
-# 
-# usage:
-# knife vsphere vm clone NewNode UbuntuTemplate --cspec StaticSpec \
-#     --cips 192.168.0.99/24,192.168.1.99/24 \
-#     --chostname NODENAME --cdomain NODEDOMAIN
-class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
-
-	banner "knife vsphere vm clone VMNAME (options)"
-
-	get_common_options
-
-	option :dest_folder,
-		:long => "--dest-folder FOLDER",
-		:description => "The folder into which to put the cloned VM"
-
-	option :datastore,
-		:long => "--datastore STORE",
-		:description => "The datastore into which to put the cloned VM"
-
-	option :resource_pool,
-		:long => "--resource-pool POOL",
-		:description => "The resource pool into which to put the cloned VM"
-
-	option :source_vm,
-		:long => "--template TEMPLATE",
-		:description => "The source VM / Template to clone from",
-		:required => true
-
-	option :customization_spec,
-		:long => "--cspec CUST_SPEC",
-		:description => "The name of any customization specification to apply"
-
-	option :customization_vlan,
-		:long => "--cvlan CUST_VLAN",
-		:description => "VLAN name for network adapter to join"
-
-	option :customization_ips,
-		:long => "--cips CUST_IPS",
-		:description => "Comma-delimited list of CIDR IPs for customization"
-
-	option :customization_gw,
-		:long => "--cgw CUST_GW",
-		:description => "CIDR IP of gateway for customization"
-
-	option :customization_hostname,
-		:long => "--chostname CUST_HOSTNAME",
-		:description => "Unqualified hostname for customization"
-
-	option :customization_domain,
-		:long => "--cdomain CUST_DOMAIN",
-		:description => "Domain name for customization"
-
-	option :customization_tz,
-		:long => "--ctz CUST_TIMEZONE",
-		:description => "Timezone invalid 'Area/Location' format"
-
-	option :customization_cpucount,
-		:long => "--ccpu CUST_CPU_COUNT",
-		:description => "Number of CPUs"
-
-	option :customization_memory,
-		:long => "--cram CUST_MEMORY_GB",
-		:description => "Gigabytes of RAM"
-
-	option :power,
-		:long => "--start STARTVM",
-		:description => "Indicates whether to start the VM after a successful clone",
-		:default => false
-
-	option :bootstrap,
-		:long => "--bootstrap FALSE",
-		:description => "Indicates whether to bootstrap the VM",
-		:default => false
-
-	option :fqdn,
-		:long => "--fqdn SERVER_FQDN",
-		:description => "Fully qualified hostname for bootstrapping"
-
-	option :ssh_user,
-		:short => "-x USERNAME",
-		:long => "--ssh-user USERNAME",
-		:description => "The ssh username",
-		:default => "root"
-
-	option :ssh_password,
-		:short => "-P PASSWORD",
-		:long => "--ssh-password PASSWORD",
-		:description => "The ssh password"
-
-	option :ssh_port,
-		:short => "-p PORT",
-		:long => "--ssh-port PORT",
-		:description => "The ssh port",
-		:default => "22",
-		:proc => Proc.new { |key| Chef::Config[:knife][:ssh_port] = key }
-
-	option :identity_file,
-		:short => "-i IDENTITY_FILE",
-		:long => "--identity-file IDENTITY_FILE",
-		:description => "The SSH identity file used for authentication"
-
-	option :chef_node_name,
-		:short => "-N NAME",
-		:long => "--node-name NAME",
-		:description => "The Chef node name for your new node"
-
-	option :prerelease,
-		:long => "--prerelease",
-		:description => "Install the pre-release chef gems"
-
-	option :bootstrap_version,
-		:long => "--bootstrap-version VERSION",
-		:description => "The version of Chef to install",
-		:proc => lambda { |v| Chef::Config[:knife][:bootstrap_version] = v }
-
-	option :bootstrap_proxy,
-		:long => "--bootstrap-proxy PROXY_URL",
-		:description => "The proxy server for the node being bootstrapped",
-		:proc => Proc.new { |p| Chef::Config[:knife][:bootstrap_proxy] = p }
-
-	option :distro,
-		:short => "-d DISTRO",
-		:long => "--distro DISTRO",
-		:description => "Bootstrap a distro using a template",
-		:default => "ubuntu10.04-gems"
-
-	option :template_file,
-		:long => "--template-file TEMPLATE",
-		:description => "Full path to location of template to use",
-		:default => false
-
-	option :run_list,
-		:short => "-r RUN_LIST",
-		:long => "--run-list RUN_LIST",
-		:description => "Comma separated list of roles/recipes to apply",
-		:proc => lambda { |o| o.split(/[\s,]+/) },
-		:default => []
-
-	option :no_host_key_verify,
-		:long => "--no-host-key-verify",
-		:description => "Disable host key verification",
-		:boolean => true,
-		:default => false
-
-	def run
-		$stdout.sync = true
-
-		vmname = @name_args[0]
-		if vmname.nil?
-			show_usage
-			fatal_exit("You must specify a virtual machine name")
-		end
-		config[:fqdn] = vmname unless config[:fqdn]
-		config[:chef_node_name] = vmname unless config[:chef_node_name]
-
-		vim = get_vim_connection
-
-    dcname = config[:vsphere_dc] || Chef::Config[:knife][:vsphere_dc]
-    dc = vim.serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
-
-		src_folder = find_folder(config[:folder]) || dc.vmFolder
-
-		src_vm = find_in_folder(src_folder, RbVmomi::VIM::VirtualMachine, config[:source_vm]) or
-		abort "VM/Template not found"
-
-		clone_spec = generate_clone_spec(src_vm.config)
-
-    cust_folder = config[:dest_folder] || config[:folder]
-
-		dest_folder = cust_folder.nil? ? src_vm.vmFolder : find_folder(cust_folder)
-
-		task = src_vm.CloneVM_Task(:folder => dest_folder, :name => vmname, :spec => clone_spec)
-		puts "Cloning template #{config[:source_vm]} to new VM #{vmname}"
-		task.wait_for_completion
-		puts "Finished creating virtual machine #{vmname}"
-
-		if config[:power] || config[:bootstrap]
-			vm = find_in_folder(dest_folder, RbVmomi::VIM::VirtualMachine, vmname) or
-			fatal_exit("VM #{vmname} not found")
-			vm.PowerOnVM_Task.wait_for_completion
-			puts "Powered on virtual machine #{vmname}"
-		end
-
-		if config[:bootstrap]
-			print "Waiting for sshd..."
-			print "." until tcp_test_ssh(config[:fqdn])
-			puts "done"
-
-			bootstrap_for_node.run
-		end
-	end
-
-	# Builds a CloneSpec
-	def generate_clone_spec (src_config)
-
-    rspec = nil
-    if config[:resource_pool]
-      rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(:pool => find_pool(config[:resource_pool]))
-    else
-      dcname = config[:vsphere_dc] || Chef::Config[:knife][:vsphere_dc]
-      dc = config[:vim].serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
-      hosts = find_all_in_folder(dc.hostFolder, RbVmomi::VIM::ComputeResource)
-      rp = hosts.first.resourcePool
-      rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(:pool => rp)
-    end
-
-		if config[:datastore]
-			rspec.datastore = find_datastore(config[:datastore])
-		end
-
-		clone_spec = RbVmomi::VIM.VirtualMachineCloneSpec(:location => rspec,
-																											:powerOn => false,
-																											:template => false)
-
-		clone_spec.config = RbVmomi::VIM.VirtualMachineConfigSpec(:deviceChange => Array.new)
-
-		if config[:customization_cpucount]
-			clone_spec.config.numCPUs = config[:customization_cpucount]
-		end
-
-		if config[:customization_memory]
-			clone_spec.config.memoryMB = Integer(config[:customization_memory]) * 1024
-		end
-
-		if config[:customization_vlan]
-			network = find_network(config[:customization_vlan])
-			switch_port = RbVmomi::VIM.DistributedVirtualSwitchPortConnection(:switchUuid => network.config.distributedVirtualSwitch.uuid ,:portgroupKey => network.key)
-			card = src_config.hardware.device.find { |d| d.deviceInfo.label == "Network adapter 1" } or
-        abort "Can't find source network card to customize"
-			card.backing.port = switch_port
-			dev_spec = RbVmomi::VIM.VirtualDeviceConfigSpec(:device => card, :operation => "edit")
-			clone_spec.config.deviceChange.push dev_spec
-		end
-
-		if config[:customization_spec]
-			csi = find_customization(config[:customization_spec]) or
-			fatal_exit("failed to find customization specification named #{config[:customization_spec]}")
-
-			if csi.info.type != "Linux"
-				fatal_exit("Only Linux customization specifications are currently supported")
-			end
-
-			if config[:customization_ips]
-				if config[:customization_gw]
-					csi.spec.nicSettingMap = config[:customization_ips].split(',').map { |i| generate_adapter_map(i,config[:customization_gw]) }
-				else
-					csi.spec.nicSettingMap = config[:customization_ips].split(',').map { |i| generate_adapter_map(i) }
-				end
-			end
-
-			use_ident = !config[:customization_hostname].nil? || !config[:customization_domain].nil?
-
-			if use_ident
-				# TODO - verify that we're deploying a linux spec, at least warn
-				ident = RbVmomi::VIM.CustomizationLinuxPrep
-
-				if config[:customization_hostname]
-					ident.hostName = RbVmomi::VIM.CustomizationFixedName
-					ident.hostName.name = config[:customization_hostname]
-				else
-					ident.hostName = RbVmomi::VIM.CustomizationFixedName
-					ident.hostName.name = config[:customization_domain]
-				end
-
-				if config[:customization_domain]
-					ident.domain = config[:customization_domain]
-				end
-
-				csi.spec.identity = ident
-			end
-
-			clone_spec.customization = csi.spec
-		end
-		clone_spec
-	end
-
-	# Retrieves a CustomizationSpecItem that matches the supplied name
-	# @param vim [Connection] VI Connection to use
-	# @param name [String] name of customization
-	# @return [RbVmomi::VIM::CustomizationSpecItem]
-	def find_customization(name)
-		csm = config[:vim].serviceContent.customizationSpecManager
-		csm.GetCustomizationSpec(:name => name)
-	end
-
-	# Generates a CustomizationAdapterMapping (currently only single IPv4 address) object
-	# @param ip [String] Any static IP address to use, otherwise DHCP
-	# @param gw [String] If static, the gateway for the interface, otherwise network address + 1 will be used
-	# @return [RbVmomi::VIM::CustomizationIPSettings]
-	def generate_adapter_map (ip=nil, gw=nil, dns1=nil, dns2=nil, domain=nil)
-
-		settings = RbVmomi::VIM.CustomizationIPSettings
-
-		if ip.nil?
-			settings.ip = RbVmomi::VIM::CustomizationDhcpIpGenerator
-		else
-			cidr_ip = NetAddr::CIDR.create(ip)
-			settings.ip = RbVmomi::VIM::CustomizationFixedIp(:ipAddress => cidr_ip.ip)
-			settings.subnetMask = cidr_ip.netmask_ext
-
-			# TODO - want to confirm gw/ip are in same subnet?
-			# Only set gateway on first IP.
-			if config[:customization_ips].split(',').first == ip
-				if gw.nil?
-					settings.gateway = [cidr_ip.network(:Objectify => true).next_ip]
-				else
-					gw_cidr = NetAddr::CIDR.create(gw)
-					settings.gateway = [gw_cidr.ip]
-				end
-			end
-		end
-
-		adapter_map = RbVmomi::VIM.CustomizationAdapterMapping
-		adapter_map.adapter = settings
-		adapter_map
-	end
-
-	def bootstrap_for_node()
-		Chef::Knife::Bootstrap.load_deps
-		bootstrap = Chef::Knife::Bootstrap.new
-		bootstrap.name_args = [config[:fqdn]]
-		bootstrap.config[:run_list] = config[:run_list]
-		bootstrap.config[:ssh_user] = config[:ssh_user]
-		bootstrap.config[:ssh_password] = config[:ssh_password]
-		bootstrap.config[:ssh_port] = config[:ssh_port]
-		bootstrap.config[:identity_file] = config[:identity_file]
-		bootstrap.config[:chef_node_name] = config[:chef_node_name]
-		bootstrap.config[:prerelease] = config[:prerelease]
-		bootstrap.config[:bootstrap_version] = locate_config_value(:bootstrap_version)
-		bootstrap.config[:distro] = locate_config_value(:distro)
-		bootstrap.config[:use_sudo] = true unless config[:ssh_user] == 'root'
-		bootstrap.config[:template_file] = locate_config_value(:template_file)
-		bootstrap.config[:environment] = config[:environment]
-		# may be needed for vpc_mode
-		bootstrap.config[:no_host_key_verify] = config[:no_host_key_verify]
-		bootstrap
-	end
-
-	def tcp_test_ssh(hostname)
-		tcp_socket = TCPSocket.new(hostname, 22)
-		readable = IO.select([tcp_socket], nil, nil, 5)
-		if readable
-			Chef::Log.debug("sshd accepting connections on #{hostname}, banner is #{tcp_socket.gets}")
-			true
-		else
-			false
-		end
-	rescue Errno::ETIMEDOUT
-		false
-	rescue Errno::EPERM
-		false
-	rescue Errno::ECONNREFUSED
-		sleep 2
-		false
-	rescue Errno::EHOSTUNREACH
-		sleep 2
-		false
-	ensure
-		tcp_socket && tcp_socket.close
-	end
-end
+#
+# Author:: Ezra Pagel (<ezra@cpan.org>)
+# Contributor:: Jesse Campbell (<hikeit@gmail.com>)
+# License:: Apache License, Version 2.0
+#
+
+require 'chef/knife'
+require 'chef/knife/BaseVsphereCommand'
+require 'rbvmomi'
+require 'netaddr'
+
+# Clone an existing template into a new VM, optionally applying a customization specification.
+# 
+# usage:
+# knife vsphere vm clone NewNode UbuntuTemplate --cspec StaticSpec \
+#     --cips 192.168.0.99/24,192.168.1.99/24 \
+#     --chostname NODENAME --cdomain NODEDOMAIN
+class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
+
+	banner "knife vsphere vm clone VMNAME (options)"
+
+	get_common_options
+
+	option :dest_folder,
+		:long => "--dest-folder FOLDER",
+		:description => "The folder into which to put the cloned VM"
+
+	option :datastore,
+		:long => "--datastore STORE",
+		:description => "The datastore into which to put the cloned VM"
+
+	option :resource_pool,
+		:long => "--resource-pool POOL",
+		:description => "The resource pool into which to put the cloned VM"
+
+	option :source_vm,
+		:long => "--template TEMPLATE",
+		:description => "The source VM / Template to clone from",
+		:required => true
+
+	option :customization_spec,
+		:long => "--cspec CUST_SPEC",
+		:description => "The name of any customization specification to apply"
+
+	option :customization_vlan,
+		:long => "--cvlan CUST_VLAN",
+		:description => "VLAN name for network adapter to join"
+
+	option :customization_ips,
+		:long => "--cips CUST_IPS",
+		:description => "Comma-delimited list of CIDR IPs for customization"
+
+	option :customization_dns_ips,
+		:long => "--cdnsips CUST_DNS_IPS",
+		:description => "Comma-delimited list of DNS IP addresses"
+
+	option :customization_dns_suffixes,
+		:long => "--cdnssuffix CUST_DNS_SUFFIXES",
+		:description => "Comma-delimited list of DNS search suffixes"
+
+	option :customization_gw,
+		:long => "--cgw CUST_GW",
+		:description => "CIDR IP of gateway for customization"
+
+	option :customization_hostname,
+		:long => "--chostname CUST_HOSTNAME",
+		:description => "Unqualified hostname for customization"
+
+	option :customization_domain,
+		:long => "--cdomain CUST_DOMAIN",
+		:description => "Domain name for customization"
+
+	option :customization_tz,
+		:long => "--ctz CUST_TIMEZONE",
+		:description => "Timezone invalid 'Area/Location' format"
+
+	option :customization_cpucount,
+		:long => "--ccpu CUST_CPU_COUNT",
+		:description => "Number of CPUs"
+
+	option :customization_memory,
+		:long => "--cram CUST_MEMORY_GB",
+		:description => "Gigabytes of RAM"
+
+	option :power,
+		:long => "--start STARTVM",
+		:description => "Indicates whether to start the VM after a successful clone",
+		:default => false
+
+	option :bootstrap,
+		:long => "--bootstrap FALSE",
+		:description => "Indicates whether to bootstrap the VM",
+		:default => false
+
+	option :fqdn,
+		:long => "--fqdn SERVER_FQDN",
+		:description => "Fully qualified hostname for bootstrapping"
+
+	option :ssh_user,
+		:short => "-x USERNAME",
+		:long => "--ssh-user USERNAME",
+		:description => "The ssh username",
+		:default => "root"
+
+	option :ssh_password,
+		:short => "-P PASSWORD",
+		:long => "--ssh-password PASSWORD",
+		:description => "The ssh password"
+
+	option :ssh_port,
+		:short => "-p PORT",
+		:long => "--ssh-port PORT",
+		:description => "The ssh port",
+		:default => "22",
+		:proc => Proc.new { |key| Chef::Config[:knife][:ssh_port] = key }
+
+	option :identity_file,
+		:short => "-i IDENTITY_FILE",
+		:long => "--identity-file IDENTITY_FILE",
+		:description => "The SSH identity file used for authentication"
+
+	option :chef_node_name,
+		:short => "-N NAME",
+		:long => "--node-name NAME",
+		:description => "The Chef node name for your new node"
+
+	option :prerelease,
+		:long => "--prerelease",
+		:description => "Install the pre-release chef gems"
+
+	option :bootstrap_version,
+		:long => "--bootstrap-version VERSION",
+		:description => "The version of Chef to install",
+		:proc => lambda { |v| Chef::Config[:knife][:bootstrap_version] = v }
+
+	option :bootstrap_proxy,
+		:long => "--bootstrap-proxy PROXY_URL",
+		:description => "The proxy server for the node being bootstrapped",
+		:proc => Proc.new { |p| Chef::Config[:knife][:bootstrap_proxy] = p }
+
+	option :distro,
+		:short => "-d DISTRO",
+		:long => "--distro DISTRO",
+		:description => "Bootstrap a distro using a template",
+		:default => "ubuntu10.04-gems"
+
+	option :template_file,
+		:long => "--template-file TEMPLATE",
+		:description => "Full path to location of template to use",
+		:default => false
+
+	option :run_list,
+		:short => "-r RUN_LIST",
+		:long => "--run-list RUN_LIST",
+		:description => "Comma separated list of roles/recipes to apply",
+		:proc => lambda { |o| o.split(/[\s,]+/) },
+		:default => []
+
+	option :no_host_key_verify,
+		:long => "--no-host-key-verify",
+		:description => "Disable host key verification",
+		:boolean => true,
+		:default => false
+
+	def run
+		$stdout.sync = true
+
+		vmname = @name_args[0]
+		if vmname.nil?
+			show_usage
+			fatal_exit("You must specify a virtual machine name")
+		end
+		config[:fqdn] = vmname unless config[:fqdn]
+		config[:chef_node_name] = vmname unless config[:chef_node_name]
+		config[:vmname] = vmname
+
+		vim = get_vim_connection
+
+    dcname = config[:vsphere_dc] || Chef::Config[:knife][:vsphere_dc]
+    dc = vim.serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
+
+		src_folder = find_folder(config[:folder]) || dc.vmFolder
+
+		src_vm = find_in_folder(src_folder, RbVmomi::VIM::VirtualMachine, config[:source_vm]) or
+		abort "VM/Template not found"
+
+		clone_spec = generate_clone_spec(src_vm.config)
+
+    cust_folder = config[:dest_folder] || config[:folder]
+
+		dest_folder = cust_folder.nil? ? src_vm.vmFolder : find_folder(cust_folder)
+
+		task = src_vm.CloneVM_Task(:folder => dest_folder, :name => vmname, :spec => clone_spec)
+		puts "Cloning template #{config[:source_vm]} to new VM #{vmname}"
+		task.wait_for_completion
+		puts "Finished creating virtual machine #{vmname}"
+
+		if config[:power] || config[:bootstrap]
+			vm = find_in_folder(dest_folder, RbVmomi::VIM::VirtualMachine, vmname) or
+			fatal_exit("VM #{vmname} not found")
+			vm.PowerOnVM_Task.wait_for_completion
+			puts "Powered on virtual machine #{vmname}"
+		end
+
+		if config[:bootstrap]
+			print "Waiting for sshd..."
+			print "." until tcp_test_ssh(config[:fqdn])
+			puts "done"
+
+			bootstrap_for_node.run
+		end
+	end
+
+	# Builds a CloneSpec
+	def generate_clone_spec (src_config)
+
+    rspec = nil
+    if config[:resource_pool]
+      rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(:pool => find_pool(config[:resource_pool]))
+    else
+      dcname = config[:vsphere_dc] || Chef::Config[:knife][:vsphere_dc]
+      dc = config[:vim].serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
+      hosts = find_all_in_folder(dc.hostFolder, RbVmomi::VIM::ComputeResource)
+      rp = hosts.first.resourcePool
+      rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(:pool => rp)
+    end
+
+		if config[:datastore]
+			rspec.datastore = find_datastore(config[:datastore])
+		end
+
+		clone_spec = RbVmomi::VIM.VirtualMachineCloneSpec(:location => rspec,
+																											:powerOn => false,
+																											:template => false)
+
+		clone_spec.config = RbVmomi::VIM.VirtualMachineConfigSpec(:deviceChange => Array.new)
+
+		if config[:customization_cpucount]
+			clone_spec.config.numCPUs = config[:customization_cpucount]
+		end
+
+		if config[:customization_memory]
+			clone_spec.config.memoryMB = Integer(config[:customization_memory]) * 1024
+		end
+
+		if config[:customization_vlan]
+			network = find_network(config[:customization_vlan])
+			switch_port = RbVmomi::VIM.DistributedVirtualSwitchPortConnection(:switchUuid => network.config.distributedVirtualSwitch.uuid ,:portgroupKey => network.key)
+			card = src_config.hardware.device.find { |d| d.deviceInfo.label == "Network adapter 1" } or
+        abort "Can't find source network card to customize"
+			card.backing.port = switch_port
+			dev_spec = RbVmomi::VIM.VirtualDeviceConfigSpec(:device => card, :operation => "edit")
+			clone_spec.config.deviceChange.push dev_spec
+		end
+
+		if config[:customization_spec]
+			csi = find_customization(config[:customization_spec]) or
+			fatal_exit("failed to find customization specification named #{config[:customization_spec]}")
+
+			if csi.info.type != "Linux"
+				fatal_exit("Only Linux customization specifications are currently supported")
+			end
+			cust_spec = csi.spec
+		else
+			global_ipset = RbVmomi::VIM.CustomizationGlobalIPSettings
+			cust_spec = RbVmomi::VIM.CustomizationSpec(:globalIPSettings => global_ipset)
+		end
+
+		if config[:customization_dns_ips]
+			cust_spec.globalIPSettings.dnsServerList = config[:customization_dns_ips].split(',')
+		end
+
+		if config[:customization_dns_suffixes]
+			cust_spec.globalIPSettings.dnsSuffixList = config[:customization_dns_suffixes].split(',')
+		end
+
+		if config[:customization_ips]
+			if config[:customization_gw]
+				cust_spec.nicSettingMap = config[:customization_ips].split(',').map { |i| generate_adapter_map(i,config[:customization_gw]) }
+			else
+				cust_spec.nicSettingMap = config[:customization_ips].split(',').map { |i| generate_adapter_map(i) }
+			end
+		end
+
+		use_ident = !config[:customization_hostname].nil? || !config[:customization_domain].nil? || cust_spec.identity.nil?
+
+		if use_ident
+			# TODO - verify that we're deploying a linux spec, at least warn
+			ident = RbVmomi::VIM.CustomizationLinuxPrep
+
+			ident.hostName = RbVmomi::VIM.CustomizationFixedName
+			if config[:customization_hostname]
+				ident.hostName.name = config[:customization_hostname]
+			elsif config[:customization_domain]
+				ident.hostName.name = config[:customization_domain]
+			else
+				ident.hostName.name = config[:vmname]
+			end
+
+			if config[:customization_domain]
+				ident.domain = config[:customization_domain]
+			else
+				ident.domain = ''
+			end
+
+			cust_spec.identity = ident
+		end
+
+		clone_spec.customization = cust_spec
+		clone_spec
+	end
+
+	# Retrieves a CustomizationSpecItem that matches the supplied name
+	# @param vim [Connection] VI Connection to use
+	# @param name [String] name of customization
+	# @return [RbVmomi::VIM::CustomizationSpecItem]
+	def find_customization(name)
+		csm = config[:vim].serviceContent.customizationSpecManager
+		csm.GetCustomizationSpec(:name => name)
+	end
+
+	# Generates a CustomizationAdapterMapping (currently only single IPv4 address) object
+	# @param ip [String] Any static IP address to use, otherwise DHCP
+	# @param gw [String] If static, the gateway for the interface, otherwise network address + 1 will be used
+	# @return [RbVmomi::VIM::CustomizationIPSettings]
+	def generate_adapter_map (ip=nil, gw=nil, dns1=nil, dns2=nil, domain=nil)
+
+		settings = RbVmomi::VIM.CustomizationIPSettings
+
+		if ip.nil?
+			settings.ip = RbVmomi::VIM::CustomizationDhcpIpGenerator
+		else
+			cidr_ip = NetAddr::CIDR.create(ip)
+			settings.ip = RbVmomi::VIM::CustomizationFixedIp(:ipAddress => cidr_ip.ip)
+			settings.subnetMask = cidr_ip.netmask_ext
+
+			# TODO - want to confirm gw/ip are in same subnet?
+			# Only set gateway on first IP.
+			if config[:customization_ips].split(',').first == ip
+				if gw.nil?
+					settings.gateway = [cidr_ip.network(:Objectify => true).next_ip]
+				else
+					gw_cidr = NetAddr::CIDR.create(gw)
+					settings.gateway = [gw_cidr.ip]
+				end
+			end
+		end
+
+		adapter_map = RbVmomi::VIM.CustomizationAdapterMapping
+		adapter_map.adapter = settings
+		adapter_map
+	end
+
+	def bootstrap_for_node()
+		Chef::Knife::Bootstrap.load_deps
+		bootstrap = Chef::Knife::Bootstrap.new
+		bootstrap.name_args = [config[:fqdn]]
+		bootstrap.config[:run_list] = config[:run_list]
+		bootstrap.config[:ssh_user] = config[:ssh_user]
+		bootstrap.config[:ssh_password] = config[:ssh_password]
+		bootstrap.config[:ssh_port] = config[:ssh_port]
+		bootstrap.config[:identity_file] = config[:identity_file]
+		bootstrap.config[:chef_node_name] = config[:chef_node_name]
+		bootstrap.config[:prerelease] = config[:prerelease]
+		bootstrap.config[:bootstrap_version] = locate_config_value(:bootstrap_version)
+		bootstrap.config[:distro] = locate_config_value(:distro)
+		bootstrap.config[:use_sudo] = true unless config[:ssh_user] == 'root'
+		bootstrap.config[:template_file] = locate_config_value(:template_file)
+		bootstrap.config[:environment] = config[:environment]
+		# may be needed for vpc_mode
+		bootstrap.config[:no_host_key_verify] = config[:no_host_key_verify]
+		bootstrap
+	end
+
+	def tcp_test_ssh(hostname)
+		tcp_socket = TCPSocket.new(hostname, 22)
+		readable = IO.select([tcp_socket], nil, nil, 5)
+		if readable
+			Chef::Log.debug("sshd accepting connections on #{hostname}, banner is #{tcp_socket.gets}")
+			true
+		else
+			false
+		end
+	rescue Errno::ETIMEDOUT
+		false
+	rescue Errno::EPERM
+		false
+	rescue Errno::ECONNREFUSED
+		sleep 2
+		false
+	rescue Errno::EHOSTUNREACH
+		sleep 2
+		false
+	ensure
+		tcp_socket && tcp_socket.close
+	end
+end