diff options
Diffstat (limited to 'patches/opnfv-fuel/0004-virtual_fuel-factor-out-image-creation-into-a-method.patch')
| -rw-r--r-- | patches/opnfv-fuel/0004-virtual_fuel-factor-out-image-creation-into-a-method.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0004-virtual_fuel-factor-out-image-creation-into-a-method.patch b/patches/opnfv-fuel/0004-virtual_fuel-factor-out-image-creation-into-a-method.patch new file mode 100644 index 00000000..4e1f583b --- /dev/null +++ b/patches/opnfv-fuel/0004-virtual_fuel-factor-out-image-creation-into-a-method.patch @@ -0,0 +1,35 @@ +From: Josep Puigdemont <josep.puigdemont@enea.com> +Date: Wed, 4 May 2016 14:27:23 +0200 +Subject: [PATCH] virtual_fuel: factor out image creation into a method + +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com> +--- + deploy/environments/virtual_fuel.py | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/deploy/environments/virtual_fuel.py b/deploy/environments/virtual_fuel.py +index 966bb91..82c4e47 100644 +--- a/deploy/environments/virtual_fuel.py ++++ b/deploy/environments/virtual_fuel.py +@@ -51,15 +51,20 @@ class VirtualFuel(ExecutionEnvironment): + with open(temp_vm_file, 'w') as f: + vm_xml.write(f, pretty_print=True, xml_declaration=True) + ++ def create_image(self, disk_path, disk_size): ++ exec_cmd('qemu-img create -f qcow2 %s %s' % (disk_path, disk_size)) ++ + def create_vm(self): + vm_template = '%s/%s' % (self.root_dir, + self.dha.get_node_property( + self.fuel_node_id, 'libvirtTemplate')) + check_file_exists(vm_template) ++ + disk_path = '%s/%s.raw' % (self.storage_dir, self.vm_name) + disk_sizes = self.dha.get_disks() + disk_size = disk_sizes['fuel'] +- exec_cmd('qemu-img create -f qcow2 %s %s' % (disk_path, disk_size)) ++ self.create_image(disk_path, disk_size) ++ + temp_vm_file = '%s/%s' % (self.temp_dir, self.vm_name) + exec_cmd('cp %s %s' % (vm_template, temp_vm_file)) + self.set_vm_nic(temp_vm_file) |