diff options
Diffstat (limited to 'deploy/dha_adapters')
| -rw-r--r-- | deploy/dha_adapters/hardware_adapter.py | 5 | ||||
| -rw-r--r-- | deploy/dha_adapters/libvirt_adapter.py | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/deploy/dha_adapters/hardware_adapter.py b/deploy/dha_adapters/hardware_adapter.py index 2cd5ab842..55bb4002e 100644 --- a/deploy/dha_adapters/hardware_adapter.py +++ b/deploy/dha_adapters/hardware_adapter.py @@ -58,3 +58,8 @@ class HardwareAdapter(object): def get_disks(self): return self.dha_struct['disks'] + + def get_number_cpus(self, role): + role_cpus_dict = self.dha_struct.get('number_cpus') + if role_cpus_dict: + return role_cpus_dict.get(role) diff --git a/deploy/dha_adapters/libvirt_adapter.py b/deploy/dha_adapters/libvirt_adapter.py index c65dab554..85913ac9e 100644 --- a/deploy/dha_adapters/libvirt_adapter.py +++ b/deploy/dha_adapters/libvirt_adapter.py @@ -95,9 +95,12 @@ class LibvirtAdapter(HardwareAdapter): sources = disk.xpath('source') for source in sources: disk_file = source.get('file') - disk_size = exec_cmd('ls -l %s' % disk_file).split()[4] + disk_size = exec_cmd('qemu-img info ' + '%s |grep \"virtual size:\"' + % disk_file).split()[2] delete(disk_file) - exec_cmd('fallocate -l %s %s' % (disk_size, disk_file)) + exec_cmd('qemu-img create -f qcow2 %s %s' % (disk_file, + disk_size)) def node_eject_iso(self, node_id): vm_name = self.get_node_property(node_id, 'libvirtName') |