shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-12 21:57:23 +03:00
Code Releases Wiki Activity

bug: vCPU in vcenter follows OpenNebula convention

Browse Source 
(cherry picked from commit 8c5deb7e103c75d76fab876546c63322de74b2e1)
This commit is contained in:
Ruben S. Montero 2015-10-07 18:02:41 +02:00
parent c80e6a275a
commit 10f5386122
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/vmm_mad/remotes/vcenter/vcenter_driver.rb
View File

@ -798,7 +798,7 @@ class VCenterVm
# Find out if we need to reconfigure capacity
xml = REXML::Document.new xml_text
expected_cpu = xml.root.elements["//TEMPLATE/VCPU"].text rescue xml.root.elements["//TEMPLATE/CPU"].text.to_f.ceil rescue 1
expected_cpu = xml.root.elements["//TEMPLATE/VCPU"] ? xml.root.elements["//TEMPLATE/CPU"].text : 1
expected_memory = xml.root.elements["//TEMPLATE/MEMORY"].text
current_cpu = vm.config.hardware.numCPU
current_memory = vm.config.hardware.memoryMB
@ -1512,7 +1512,7 @@ private
# Capacity section
cpu = xml.root.elements["//TEMPLATE/VCPU"].text rescue xml.root.elements["//TEMPLATE/CPU"].text.to_f.ceil rescue 1
cpu = xml.root.elements["//TEMPLATE/VCPU"] ? xml.root.elements["//TEMPLATE/CPU"].text : 1
memory = xml.root.elements["//TEMPLATE/MEMORY"].text
capacity_spec = {:numCPUs => cpu.to_i,
:memoryMB => memory }