Merge pull request #1740 from aussielunix/vsphere-clone-conflicts
[vsphere|compute] cleanup merge conflicts with clone method
This commit is contained in:
commit
db4137c76b
|
@ -141,6 +141,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') )
|
||||
# Options['customization_spec']
|
||||
|
@ -189,15 +191,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
|
||||
|
|
Loading…
Reference in New Issue