From 6d254e7f780947ffa3bcf5b726bc2e6a195b45aa Mon Sep 17 00:00:00 2001 From: Mick Pollard Date: Sun, 7 Apr 2013 13:22:55 +1000 Subject: [PATCH] [vsphere|compute] cleanup merge conflicts with clone method --- lib/fog/vsphere/requests/compute/vm_clone.rb | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/lib/fog/vsphere/requests/compute/vm_clone.rb b/lib/fog/vsphere/requests/compute/vm_clone.rb index f5b857ee3..ee6f2522f 100644 --- a/lib/fog/vsphere/requests/compute/vm_clone.rb +++ b/lib/fog/vsphere/requests/compute/vm_clone.rb @@ -146,6 +146,8 @@ module Fog # Options['numCPUs'] or Options['memoryMB'] # Build up the specification for Hardware, for more details see ____________ # https://github.com/rlane/rbvmomi/blob/master/test/test_serialization.rb + # http://www.vmware.com/support/developer/vc-sdk/visdk41pubs/ApiReference/vim.vm.ConfigSpec.html + # FIXME: pad this out with the rest of the useful things in VirtualMachineConfigSpec virtual_machine_config_spec.numCPUs = options['numCPUs'] if ( options.has_key?('numCPUs') ) virtual_machine_config_spec.memoryMB = options['memoryMB'] if ( options.has_key?('memoryMB') ) @@ -195,15 +197,6 @@ module Fog end customization_spec ||= nil - # FIXME: pad this out with the rest of the useful things in VirtualMachineConfigSpec - # http://www.vmware.com/support/developer/vc-sdk/visdk41pubs/ApiReference/vim.vm.ConfigSpec.html - if options.has_key?('memoryMB') || options.has_key?('numCPUs') - virtual_machine_config_spec = { - :memoryMB => options['memoryMB'], - :numCPUs => options['numCPUs'] - } - end - relocation_spec=nil if ( options['linked_clone'] ) # cribbed heavily from the rbvmomi clone_vm.rb