knife-vsphere 0.4.0 → 0.5.0

data/lib/chef/knife/BaseVsphereCommand.rb

@@ -1,180 +1,219 @@
-#
-# Author:: Ezra Pagel (<ezra@cpan.org>)
-# Contributor:: Jesse Campbell (<hikeit@gmail.com>)
-# License:: Apache License, Version 2.0
-#
-
-require 'chef/knife'
-require 'rbvmomi'
-
-# Base class for vsphere knife commands
-class Chef
-	class Knife
-		class BaseVsphereCommand < Knife
-
-			deps do
-				require 'chef/knife/bootstrap'
-				Chef::Knife::Bootstrap.load_deps
-				require 'fog'
-				require 'socket'
-				require 'net/ssh/multi'
-				require 'readline'
-				require 'chef/json_compat'
-			end
-
-			def self.get_common_options
-				unless defined? $default
-					$default = Hash.new
-				end
-
-				option :vsphere_user,
-					:short => "-u USERNAME",
-					:long => "--vsuser USERNAME",
-					:description => "The username for vsphere"
-
-				option :vsphere_pass,
-					:short => "-p PASSWORD",
-					:long => "--vspass PASSWORD",
-					:description => "The password for vsphere"
-
-				option :vsphere_host,
-					:long => "--vshost HOST",
-					:description => "The vsphere host"
-
-				option :vsphere_dc,
-					:short => "-d DATACENTER",
-					:long => "--vsdc DATACENTER",
-					:description => "The Datacenter for vsphere"
-
-				option :vsphere_path,
-					:long => "--vspath SOAP_PATH",
-					:description => "The vsphere SOAP endpoint path"
-				$default[:vsphere_path] = "/sdk"
-
-				option :vsphere_port,
-					:long => "--vsport PORT",
-					:description => "The VI SDK port number to use"
-				$default[:vsphere_port] = 443
-
-				option :vshere_nossl,
-					:long => "--vsnossl",
-					:description => "Disable SSL connectivity"
-
-				option :vsphere_insecure,
-					:long => "--vsinsecure",
-					:description => "Disable SSL certificate verification"
-
-				option :folder,
-					:short => "-f FOLDER",
-					:long => "--folder FOLDER",
-					:description => "The folder to get VMs from"
-				$default[:folder] = ''
-			end
-
-			def get_config(key)
-				key = key.to_sym
-				rval = config[key] || Chef::Config[:knife][key] || $default[key]
-				Chef::Log.debug("value for config item #{key}: #{rval}")
-				rval
-			end
-
-			def get_vim_connection
-
-				conn_opts = {
-					:host => get_config(:vsphere_host),
-					:path => get_config(:vshere_path),
-					:port => get_config(:vsphere_port),
-					:use_ssl => !get_config(:vsphere_nossl),
-					:user => get_config(:vsphere_user),
-					:password => get_config(:vsphere_pass),
-					:insecure => get_config(:vsphere_insecure)
-				}
-
-				#    opt :debug, "Log SOAP messages", :short => 'd', :default => (ENV['RBVMOMI_DEBUG'] || false)
-
-				vim = RbVmomi::VIM.connect conn_opts
-				config[:vim] = vim
-				return vim
-			end
-
-			def find_folder(folderName)
-				dcname = get_config(:vsphere_dc)
-				dc = config[:vim].serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
-				baseEntity = dc.vmFolder
-				entityArray = folderName.split('/')
-				entityArray.each do |entityArrItem|
-					if entityArrItem != ''
-						baseEntity = baseEntity.childEntity.grep(RbVmomi::VIM::Folder).find { |f| f.name == entityArrItem } or
-              abort "no such folder #{folderName} while looking for #{entityArrItem}"
-					end
-				end
-				baseEntity
-			end
-
-			def find_network(networkName)
-				dcname = get_config(:vsphere_dc)
-				dc = config[:vim].serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
-				baseEntity = dc.network
-				baseEntity.find { |f| f.name == networkName } or abort "no such network #{networkName}"
-			end
-
-			def find_pool(poolName)
-				dcname = get_config(:vsphere_dc)
-				dc = config[:vim].serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
-				baseEntity = dc.hostFolder
-				entityArray = poolName.split('/')
-				entityArray.each do |entityArrItem|
-					if entityArrItem != ''
-						if baseEntity.is_a? RbVmomi::VIM::Folder
-							baseEntity = baseEntity.childEntity.find { |f| f.name == entityArrItem } or
-                abort "no such pool #{poolName} while looking for #{entityArrItem}"
-						elsif baseEntity.is_a? RbVmomi::VIM::ClusterComputeResource
-							baseEntity = baseEntity.resourcePool.resourcePool.find { |f| f.name == entityArrItem } or
-                abort "no such pool #{poolName} while looking for #{entityArrItem}"
-						elsif baseEntity.is_a? RbVmomi::VIM::ResourcePool
-							baseEntity = baseEntity.resourcePool.find { |f| f.name == entityArrItem } or
-                abort "no such pool #{poolName} while looking for #{entityArrItem}"
-						else
-							abort "Unexpected Object type encountered #{baseEntity.type} while finding resourcePool"
-						end
-					end
-				end
-
-        baseEntity = baseEntity.resourcePool if not baseEntity.is_a?(RbVmomi::VIM::ResourcePool) and baseEntity.respond_to?(:resourcePool)
-        baseEntity
-			end
-
-			def find_datastore(dsName)
-				dcname = get_config(:vsphere_dc)
-				dc = config[:vim].serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
-				baseEntity = dc.datastore
-				baseEntity.find { |f| f.info.name == dsName } or abort "no such datastore #{dsName}"
-			end
-
-
-			def find_all_in_folder(folder, type)
-				if folder.instance_of?(RbVmomi::VIM::ClusterComputeResource)
-					folder = folder.resourcePool
-				end
-				if folder.instance_of?(RbVmomi::VIM::ResourcePool)
-					folder.resourcePool.grep(type)
-				elsif folder.instance_of?(RbVmomi::VIM::Folder)
-					folder.childEntity.grep(type)
-				else
-					puts "Unknown type #{folder.class}, not enumerating"
-					nil
-				end
-			end
-
-			def find_in_folder(folder, type, name)
-				folder.childEntity.grep(type).find { |o| o.name == name }
-			end
-
-			def fatal_exit(msg)
-				ui.fatal(msg)
-				exit 1
-			end
-
-		end
-	end
-end
+#
+# Author:: Ezra Pagel (<ezra@cpan.org>)
+# Contributor:: Jesse Campbell (<hikeit@gmail.com>)
+# License:: Apache License, Version 2.0
+#
+
+require 'chef/knife'
+require 'rbvmomi'
+
+# Base class for vsphere knife commands
+class Chef
+	class Knife
+		class BaseVsphereCommand < Knife
+
+			deps do
+				require 'chef/knife/bootstrap'
+				Chef::Knife::Bootstrap.load_deps
+				require 'fog'
+				require 'socket'
+				require 'net/ssh/multi'
+				require 'readline'
+				require 'chef/json_compat'
+			end
+
+			def self.get_common_options
+				unless defined? $default
+					$default = Hash.new
+				end
+
+				option :vsphere_user,
+					:short => "-u USERNAME",
+					:long => "--vsuser USERNAME",
+					:description => "The username for vsphere"
+
+				option :vsphere_pass,
+					:short => "-p PASSWORD",
+					:long => "--vspass PASSWORD",
+					:description => "The password for vsphere"
+
+				option :vsphere_host,
+					:long => "--vshost HOST",
+					:description => "The vsphere host"
+
+				option :vsphere_dc,
+					:short => "-d DATACENTER",
+					:long => "--vsdc DATACENTER",
+					:description => "The Datacenter for vsphere"
+
+				option :vsphere_path,
+					:long => "--vspath SOAP_PATH",
+					:description => "The vsphere SOAP endpoint path"
+				$default[:vsphere_path] = "/sdk"
+
+				option :vsphere_port,
+					:long => "--vsport PORT",
+					:description => "The VI SDK port number to use"
+				$default[:vsphere_port] = 443
+
+				option :vshere_nossl,
+					:long => "--vsnossl",
+					:description => "Disable SSL connectivity"
+
+				option :vsphere_insecure,
+					:long => "--vsinsecure",
+					:description => "Disable SSL certificate verification"
+
+				option :folder,
+					:short => "-f FOLDER",
+					:long => "--folder FOLDER",
+					:description => "The folder to get VMs from"
+				$default[:folder] = ''
+			end
+
+			def get_config(key)
+				key = key.to_sym
+				rval = config[key] || Chef::Config[:knife][key] || $default[key]
+				Chef::Log.debug("value for config item #{key}: #{rval}")
+				rval
+			end
+
+			def get_vim_connection
+
+				conn_opts = {
+					:host => get_config(:vsphere_host),
+					:path => get_config(:vshere_path),
+					:port => get_config(:vsphere_port),
+					:use_ssl => !get_config(:vsphere_nossl),
+					:user => get_config(:vsphere_user),
+					:password => get_config(:vsphere_pass),
+					:insecure => get_config(:vsphere_insecure)
+				}
+				
+				# Grab the password from the command line
+				# if tt is not in the config file
+				if not conn_opts[:password]
+                                  conn_opts[:password] = get_password
+                                end
+
+				#    opt :debug, "Log SOAP messages", :short => 'd', :default => (ENV['RBVMOMI_DEBUG'] || false)
+
+				vim = RbVmomi::VIM.connect conn_opts
+				config[:vim] = vim
+				return vim
+			end
+			
+			def get_password
+			  @password ||= ui.ask("Enter your password: ") { |q| q.echo = false }
+			end
+
+			def find_folder(folderName)
+				dcname = get_config(:vsphere_dc)
+				dc = config[:vim].serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
+				baseEntity = dc.vmFolder
+				entityArray = folderName.split('/')
+				entityArray.each do |entityArrItem|
+					if entityArrItem != ''
+						baseEntity = baseEntity.childEntity.grep(RbVmomi::VIM::Folder).find { |f| f.name == entityArrItem } or
+              abort "no such folder #{folderName} while looking for #{entityArrItem}"
+					end
+				end
+				baseEntity
+			end
+
+			def find_network(networkName)
+				dcname = get_config(:vsphere_dc)
+				dc = config[:vim].serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
+				baseEntity = dc.network
+				baseEntity.find { |f| f.name == networkName } or abort "no such network #{networkName}"
+			end
+
+			def find_pool(poolName)
+				dcname = get_config(:vsphere_dc)
+				dc = config[:vim].serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
+				baseEntity = dc.hostFolder
+				entityArray = poolName.split('/')
+				entityArray.each do |entityArrItem|
+					if entityArrItem != ''
+						if baseEntity.is_a? RbVmomi::VIM::Folder
+							baseEntity = baseEntity.childEntity.find { |f| f.name == entityArrItem } or
+                abort "no such pool #{poolName} while looking for #{entityArrItem}"
+						elsif baseEntity.is_a? RbVmomi::VIM::ClusterComputeResource
+							baseEntity = baseEntity.resourcePool.resourcePool.find { |f| f.name == entityArrItem } or
+                abort "no such pool #{poolName} while looking for #{entityArrItem}"
+						elsif baseEntity.is_a? RbVmomi::VIM::ResourcePool
+							baseEntity = baseEntity.resourcePool.find { |f| f.name == entityArrItem } or
+                abort "no such pool #{poolName} while looking for #{entityArrItem}"
+						else
+							abort "Unexpected Object type encountered #{baseEntity.type} while finding resourcePool"
+						end
+					end
+				end
+
+        baseEntity = baseEntity.resourcePool if not baseEntity.is_a?(RbVmomi::VIM::ResourcePool) and baseEntity.respond_to?(:resourcePool)
+        baseEntity
+			end
+
+			def find_datastore(dsName)
+				dcname = get_config(:vsphere_dc)
+				dc = config[:vim].serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
+				baseEntity = dc.datastore
+				baseEntity.find { |f| f.info.name == dsName } or abort "no such datastore #{dsName}"
+			end
+
+			def find_device(vm,deviceName)
+			  vm.config.hardware.device.each do |device|
+			    return device if device.deviceInfo.label == deviceName
+			  end
+			  nil
+			end
+
+			def find_all_in_folder(folder, type)
+				if folder.instance_of?(RbVmomi::VIM::ClusterComputeResource)
+					folder = folder.resourcePool
+				end
+				if folder.instance_of?(RbVmomi::VIM::ResourcePool)
+					folder.resourcePool.grep(type)
+				elsif folder.instance_of?(RbVmomi::VIM::Folder)
+					folder.childEntity.grep(type)
+				else
+					puts "Unknown type #{folder.class}, not enumerating"
+					nil
+				end
+			end
+
+			def find_in_folder(folder, type, name)
+				folder.childEntity.grep(type).find { |o| o.name == name }
+			end
+
+			def fatal_exit(msg)
+				ui.fatal(msg)
+				exit 1
+			end
+
+			def tcp_test_port(hostname,port)
+			  tcp_socket = TCPSocket.new(hostname, port)
+			  readable = IO.select([tcp_socket], nil, nil, 5)
+			  if readable
+			    Chef::Log.debug("sshd accepting connections on #{hostname}, banner is #{tcp_socket.gets}") if port == 22
+			    true
+			  else
+			    false
+			  end
+			  rescue Errno::ETIMEDOUT
+			    false
+			  rescue Errno::EPERM
+			    false
+			  rescue Errno::ECONNREFUSED
+			    sleep 2
+			    false
+			  rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH
+			    sleep 2
+			    false
+			  ensure
+			    tcp_socket && tcp_socket.close
+			end
+			
+		end
+	end
+end

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -43,6 +43,14 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 		:long => "--cspec CUST_SPEC",
 		:description => "The name of any customization specification to apply"
 
+	option :customization_plugin,
+		:long => "--cplugin CUST_PLUGIN_PATH",
+		:description => "Path to plugin that implements KnifeVspherePlugin.customize_clone_spec and/or KnifeVspherePlugin.reconfig_vm"
+
+	option :customization_plugin_data,
+		:long => "--cplugin-data CUST_PLUGIN_DATA",
+		:description => "String of data to pass to the plugin.  Use any format you wish."
+
 	option :customization_vlan,
 		:long => "--cvlan CUST_VLAN",
 		:description => "VLAN name for network adapter to join"
@@ -209,6 +217,11 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 		task.wait_for_completion
 		puts "Finished creating virtual machine #{vmname}"
 
+		if customization_plugin && customization_plugin.respond_to?(:reconfig_vm)
+			target_vm = find_in_folder(dest_folder, RbVmomi::VIM::VirtualMachine, vmname) or abort "VM could not be found in #{dest_folder}"
+			customization_plugin.reconfig_vm(target_vm)
+		end
+
 		if get_config(:power) || get_config(:bootstrap)
 			vm = find_in_folder(dest_folder, RbVmomi::VIM::VirtualMachine, vmname) or
 			fatal_exit("VM #{vmname} not found")
@@ -328,10 +341,43 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 			cust_spec.identity = ident
 		end
 
+		if customization_plugin && customization_plugin.respond_to?(:customize_clone_spec)
+			clone_spec = customization_plugin.customize_clone_spec(src_config, clone_spec)
+		end
+
 		clone_spec.customization = cust_spec
 		clone_spec
 	end
 
+	# Loads the customization plugin if one was specified
+	# @return [KnifeVspherePlugin] the loaded and initialized plugin or nil
+	def customization_plugin
+		if @customization_plugin.nil?
+			if cplugin_path = get_config(:customization_plugin)
+				if File.exists? cplugin_path
+					require cplugin_path
+				else
+					abort "Customization plugin could not be found at #{cplugin_path}"
+				end
+
+				if Object.const_defined? 'KnifeVspherePlugin'
+					@customization_plugin = Object.const_get('KnifeVspherePlugin').new
+					if cplugin_data = get_config(:customization_plugin_data)
+						if @customization_plugin.respond_to?(:data=)
+							@customization_plugin.data = cplugin_data
+						else
+							abort "Customization plugin has no :data= accessor to receive the --cplugin-data argument.  Define both or neither."
+						end
+					end
+				else
+					abort "KnifeVspherePlugin class is not defined in #{cplugin_path}"
+				end
+			end
+		end
+
+		@customization_plugin
+	end
+
 	# Retrieves a CustomizationSpecItem that matches the supplied name
 	# @param vim [Connection] VI Connection to use
 	# @param name [String] name of customization

data/lib/chef/knife/vsphere_vm_state.rb

@@ -1,85 +1,96 @@
-#
-# Author:: Ezra Pagel (<ezra@cpan.org>)
-# License:: Apache License, Version 2.0
-#
-
-require 'chef/knife'
-require 'chef/knife/BaseVsphereCommand'
-require 'rbvmomi'
-require 'netaddr'
-
-PsOn = 'poweredOn'
-PsOff = 'poweredOff'
-PsSuspended = 'suspended'
-
-PowerStates = {
-  PsOn => 'powered on',
-  PsOff => 'powered off',
-  PsSuspended => 'suspended'
-}
-
-# Manage power state of a virtual machine
-class Chef::Knife::VsphereVmState < Chef::Knife::BaseVsphereCommand
-
-  banner "knife vsphere vm state VMNAME (options)"
-
-  get_common_options
-
-  option :state,
-  :short => "-s STATE",
-  :long => "--state STATE",
-  :description => "The power state to transition the VM into; one of on|off|suspended"
-
-  def run
-  
-    $stdout.sync = true
-
-    vmname = @name_args[0]
-    if vmname.nil?
-      show_usage
-      ui.fatal("You must specify a virtual machine name")
-      exit 1
-    end
-   
-    vim = get_vim_connection
-
-    baseFolder = find_folder(get_config(:folder));
-
-    vm = find_in_folder(baseFolder, RbVmomi::VIM::VirtualMachine, vmname) or
-      abort "VM #{vmname} not found"
-
-    state = vm.runtime.powerState
-
-    if config[:state].nil?
-      puts "VM #{vmname} is currently " + PowerStates[vm.runtime.powerState]
-    else
-
-      case config[:state]
-      when 'on'
-        if state == PsOn
-          puts "Virtual machine #{vmname} was already powered on"
-        else
-          vm.PowerOnVM_Task.wait_for_completion
-          puts "Powered on virtual machine #{vmname}"
-        end
-      when 'off'
-        if state == PsOff
-          puts "Virtual machine #{vmname} was already powered off"
-        else
-          vm.PowerOffVM_Task.wait_for_completion
-          puts "Powered off virtual machine #{vmname}"
-        end
-      when 'suspend'
-        if state == PowerStates['suspended']
-          puts "Virtual machine #{vmname} was already suspended"
-        else
-          vm.SuspendVM_Task.wait_for_completion
-          puts "Suspended virtual machine #{vmname}"
-        end
-      when 'reset'
-        vm.ResetVM_Task.wait_for_completion
-        puts "Reset virtual machine #{vmname}"
-      end
-    end
-  end
-end
+#
+# Author:: Ezra Pagel (<ezra@cpan.org>)
+# License:: Apache License, Version 2.0
+#
+
+require 'chef/knife'
+require 'chef/knife/BaseVsphereCommand'
+require 'rbvmomi'
+require 'netaddr'
+
+PsOn = 'poweredOn'
+PsOff = 'poweredOff'
+PsSuspended = 'suspended'
+
+PowerStates = {
+  PsOn => 'powered on',
+  PsOff => 'powered off',
+  PsSuspended => 'suspended'
+}
+
+# Manage power state of a virtual machine
+class Chef::Knife::VsphereVmState < Chef::Knife::BaseVsphereCommand
+
+  banner "knife vsphere vm state VMNAME (options)"
+
+  get_common_options
+
+  option :state,
+  :short => "-s STATE",
+  :long => "--state STATE",
+  :description => "The power state to transition the VM into; one of on|off|suspended"
+
+  option :wait_port,
+    :short => "-w PORT",
+    :long => "--wait-port PORT",
+    :description => "Wait for VM to be accessible on a port"
+
+  def run
+  
+    $stdout.sync = true
+
+    vmname = @name_args[0]
+    if vmname.nil?
+      show_usage
+      ui.fatal("You must specify a virtual machine name")
+      exit 1
+    end
+   
+    vim = get_vim_connection
+
+    baseFolder = find_folder(get_config(:folder));
+
+    vm = find_in_folder(baseFolder, RbVmomi::VIM::VirtualMachine, vmname) or
+      abort "VM #{vmname} not found"
+
+    state = vm.runtime.powerState
+
+    if config[:state].nil?
+      puts "VM #{vmname} is currently " + PowerStates[vm.runtime.powerState]
+    else
+
+      case config[:state]
+      when 'on'
+        if state == PsOn
+          puts "Virtual machine #{vmname} was already powered on"
+        else
+          vm.PowerOnVM_Task.wait_for_completion
+          puts "Powered on virtual machine #{vmname}"
+        end
+      when 'off'
+        if state == PsOff
+          puts "Virtual machine #{vmname} was already powered off"
+        else
+          vm.PowerOffVM_Task.wait_for_completion
+          puts "Powered off virtual machine #{vmname}"
+        end
+      when 'suspend'
+        if state == PowerStates['suspended']
+          puts "Virtual machine #{vmname} was already suspended"
+        else
+          vm.SuspendVM_Task.wait_for_completion
+          puts "Suspended virtual machine #{vmname}"
+        end
+      when 'reset'
+        vm.ResetVM_Task.wait_for_completion
+        puts "Reset virtual machine #{vmname}"
+      end
+
+      if get_config(:wait_port)
+        print "Waiting for port #{get_config(:wait_port)}..."
+        print "." until tcp_test_port(vmname,get_config(:wait_port))
+        puts "done"
+      end
+    end
+  end
+end

data/lib/chef/knife/vsphere_vm_vmdk_add.rb

@@ -0,0 +1,101 @@
+#
+# Author:: Brian Flad (<bflad417@gmail.com>)
+# License:: Apache License, Version 2.0
+#
+require 'chef/knife'
+require 'chef/knife/BaseVsphereCommand'
+
+# Lists all known virtual machines in the configured datacenter
+class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
+
+  banner "knife vsphere vm vmdk add"
+
+  get_common_options
+
+  option :vmdk_type, 
+    :long => "--vmdk-type TYPE",
+    :description => "Type of VMDK"
+  $default[:vmdk_type] = "thin"
+
+  def run
+    $stdout.sync = true
+    
+    vmname = @name_args[0]
+    if vmname.nil?
+      show_usage
+      ui.fatal("You must specify a virtual machine name")
+      exit 1
+    end
+
+    size = @name_args[1]
+    if size.nil?
+      ui.fatal "You need a VMDK size!"
+      show_usage
+      exit 1
+    end
+
+    vim = get_vim_connection
+    vdm = vim.serviceContent.virtualDiskManager
+    vm = get_vm(vmname)
+
+    vmdk_datastore = vm.datastore[0]
+    vmdk_fileName = "#{vmname}/#{vmname}_1.vmdk"
+    vmdk_name = "[#{vmdk_datastore.name}] #{vmdk_fileName}"
+    vmdk_size_kb = size.to_i * 1024 * 1024
+    vmdk_type = get_config(:vmdk_type)
+    vmdk_type = "preallocated" if vmdk_type == "thick"
+    
+    vmdk_spec = RbVmomi::VIM::FileBackedVirtualDiskSpec(
+      :adapterType => "lsiLogic",
+      :capacityKb => vmdk_size_kb,
+      :diskType => vmdk_type
+    )
+
+    ui.info "Creating VMDK"
+    ui.info "#{ui.color "Capacity:", :cyan} #{size} GB"
+    ui.info "#{ui.color "Disk:", :cyan} #{vmdk_name}"
+
+    if get_config(:noop)
+      ui.info "#{ui.color "Skipping disk creation process because --noop specified.", :red}"
+    else
+      vdm.CreateVirtualDisk_Task(
+        :datacenter => get_datacenter,
+        :name => vmdk_name,
+        :spec => vmdk_spec
+      ).wait_for_completion
+    end
+
+    ui.info "Attaching VMDK to #{vmname}"
+
+    controller = find_device(vm,"SCSI controller 0")
+
+    vmdk_backing = RbVmomi::VIM::VirtualDiskFlatVer2BackingInfo(
+      :datastore => vmdk_datastore,
+      :diskMode => "persistent",
+      :fileName => vmdk_name,
+    )
+
+    device = RbVmomi::VIM::VirtualDisk(
+      :backing => vmdk_backing,
+      :capacityInKB => vmdk_size_kb,
+      :controllerKey => controller.key,
+      :key => -1,
+      :unitNumber => controller.device.size + 1
+    )
+
+    device_config_spec = RbVmomi::VIM::VirtualDeviceConfigSpec(
+      :device => device,
+      :operation => RbVmomi::VIM::VirtualDeviceConfigSpecOperation("add")
+    )
+
+    vm_config_spec = RbVmomi::VIM::VirtualMachineConfigSpec(
+      :deviceChange => [device_config_spec]
+    )
+
+    if get_config(:noop)
+      ui.info "#{ui.color "Skipping disk attaching process because --noop specified.", :red}"
+    else
+      vm.ReconfigVM_Task(:spec => vm_config_spec).wait_for_completion
+    end
+  end
+end

data/lib/knife-vsphere/version.rb

@@ -1,4 +1,4 @@
 module KnifeVsphere
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end
 

data/lib/knife-vsphere/version.rb~

@@ -0,0 +1,4 @@
+module KnifeVsphere
+  VERSION = "0.4.0"
+end
+

metadata

@@ -2,7 +2,7 @@
 name: knife-vsphere
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Ezra Pagel
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-21 00:00:00 -05:00
+date: 2013-04-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,7 +66,9 @@ files:
 - lib/chef/knife/vsphere_vm_execute.rb
 - lib/chef/knife/vsphere_vm_list.rb
 - lib/chef/knife/vsphere_vm_state.rb
+- lib/chef/knife/vsphere_vm_vmdk_add.rb
 - lib/knife-vsphere/version.rb
+- lib/knife-vsphere/version.rb~
 has_rdoc: true
 homepage: http://github.com/ezrapagel/knife-vsphere
 licenses: []