Merge "docs: Mitaka Build req: Add p7zip-full."

[fuel.git] / deploy / environments / virtual_fuel.py

diff --git a/deploy/environments/virtual_fuel.py b/deploy/environments/virtual_fuel.py
index 705eee4..cb3bc6c 100644 (file)
--- a/deploy/environments/virtual_fuel.py
+++ b/deploy/environments/virtual_fuel.py
@@ -10,6 +10,7 @@
 
 from lxml import etree
 from execution_environment import ExecutionEnvironment
+import tempfile
 
 from common import (
     exec_cmd,
@@ -45,7 +46,7 @@ class VirtualFuel(ExecutionEnvironment):
             vm_xml.write(f, pretty_print=True, xml_declaration=True)
 
     def create_vm(self):
-        temp_dir = exec_cmd('mktemp -d')
+        temp_dir = tempfile.mkdtemp()
         vm_name = self.dha.get_node_property(self.fuel_node_id, 'libvirtName')
         vm_template = '%s/%s' % (self.root_dir,
                                  self.dha.get_node_property(
@@ -54,11 +55,13 @@ class VirtualFuel(ExecutionEnvironment):
         disk_path = '%s/%s.raw' % (self.storage_dir, vm_name)
         disk_sizes = self.dha.get_disks()
         disk_size = disk_sizes['fuel']
-        exec_cmd('fallocate -l %s %s' % (disk_size, disk_path))
+        exec_cmd('qemu-img create -f qcow2 %s %s' % (disk_path, disk_size))
         temp_vm_file = '%s/%s' % (temp_dir, vm_name)
         exec_cmd('cp %s %s' % (vm_template, temp_vm_file))
         self.set_vm_nic(temp_vm_file)
-        self.define_vm(vm_name, temp_vm_file, disk_path)
+        vm_definition_overwrite = self.dha.get_vm_definition('fuel')
+        self.define_vm(vm_name, temp_vm_file, disk_path,
+                       vm_definition_overwrite)
         delete(temp_dir)
 
     def setup_environment(self):