knife-vsphere 0.1.6 → 0.1.7

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -31,8 +31,7 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 
 	option :resource_pool,
 		:long => "--resource-pool POOL",
-		:description => "The resource pool into which to put the cloned VM",
-		:default => ''
+		:description => "The resource pool into which to put the cloned VM"
 
 	option :source_vm,
 		:long => "--template TEMPLATE",
@@ -75,15 +74,15 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 		:long => "--cram CUST_MEMORY_GB",
 		:description => "Gigabytes of RAM"
 
-	option :power,  
+	option :power,
 		:long => "--start STARTVM",
 		:description => "Indicates whether to start the VM after a successful clone",
-		:default => true
+		:default => false
 
-	option :bootstrap,  
+	option :bootstrap,
 		:long => "--bootstrap FALSE",
 		:description => "Indicates whether to bootstrap the VM",
-		:default => true
+		:default => false
 
 	option :fqdn,
 		:long => "--fqdn SERVER_FQDN",
@@ -156,7 +155,6 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 		:default => false
 
 	def run
-
 		$stdout.sync = true
 
 		vmname = @name_args[0]
@@ -167,16 +165,21 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 		config[:fqdn] = vmname unless config[:fqdn]
 		config[:chef_node_name] = vmname unless config[:chef_node_name]
 
-		get_vim_connection
+		vim = get_vim_connection
 
-		src_folder = find_folder(config[:folder])
+    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)
 
-		dest_folder = find_folder(config[:dest_folder] || config[:folder]);
+    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}"
@@ -201,7 +204,17 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 
 	# Builds a CloneSpec
 	def generate_clone_spec (src_config)
-		rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(:pool => find_pool(config[:resource_pool]))
+
+    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])

metadata

@@ -2,15 +2,16 @@
 name: knife-vsphere
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Ezra Pagel
+- Jesse Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-01-17 00:00:00 -06:00
+date: 2012-01-24 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,7 +65,7 @@ files:
 - lib/chef/knife/vsphere_vm_state.rb
 - lib/knife-vsphere/version.rb
 has_rdoc: true
-homepage: 
+homepage: http://github.com/ezrapagel/knife-vsphere
 licenses: []
 
 post_install_message: