kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

[vsphere|compute] cleanup merge conflicts with clone method

Browse source
This commit is contained in:
Mick Pollard 2013-04-07 13:22:55 +10:00
parent 6ca3880a31
commit 6d254e7f78
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/fog/vsphere/requests/compute/vm_clone.rb
View file

@ -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