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

Merge pull request #1279 from rvrignaud/vcpu-count

Inconsistent usage of cpus / vpcus in libvirt / requests.
This commit is contained in:
Ohad Levy 2012-11-15 02:16:25 -08:00
commit 6c1d734a57

View file

@ -58,7 +58,7 @@ module Fog
:max_memory_size => dom.info.max_mem, :max_memory_size => dom.info.max_mem,
:cputime => dom.info.cpu_time, :cputime => dom.info.cpu_time,
:memory_size => dom.info.memory, :memory_size => dom.info.memory,
:vcpus => dom.info.nr_virt_cpu, :cpus => dom.info.nr_virt_cpu,
:autostart => dom.autostart?, :autostart => dom.autostart?,
:os_type => dom.os_type, :os_type => dom.os_type,
:active => dom.active?, :active => dom.active?,
@ -89,7 +89,7 @@ module Fog
:max_memory_size => 8, :max_memory_size => 8,
:cputime => 7, :cputime => 7,
:memory_size => 6, :memory_size => 6,
:vcpus => 5, :cpus => 5,
:autostart => false, :autostart => false,
:os_type => "RHEL6", :os_type => "RHEL6",
:active => false, :active => false,