diff options
Diffstat (limited to 'deploy')
9 files changed, 10 insertions, 10 deletions
diff --git a/deploy/dha_adapters/libvirt_adapter.py b/deploy/dha_adapters/libvirt_adapter.py index 466f134ae..a00f09147 100644 --- a/deploy/dha_adapters/libvirt_adapter.py +++ b/deploy/dha_adapters/libvirt_adapter.py @@ -109,7 +109,7 @@ class LibvirtAdapter(HardwareAdapter): '%s |grep \"virtual size:\"' % disk_file).split()[2] delete(disk_file) - exec_cmd('qemu-img create -f qcow2 %s %s' % (disk_file, + exec_cmd('qemu-img create -f raw %s %s' % (disk_file, disk_size)) def node_eject_iso(self, node_id): diff --git a/deploy/environments/libvirt_environment.py b/deploy/environments/libvirt_environment.py index c9fa41fd7..07a47fd7e 100644 --- a/deploy/environments/libvirt_environment.py +++ b/deploy/environments/libvirt_environment.py @@ -36,7 +36,7 @@ class LibvirtEnvironment(ExecutionEnvironment): def create_storage(self, node_id, disk_path, disk_sizes): role = self.dea.get_node_main_role(node_id, self.fuel_node_id) disk_size = disk_sizes[role] - exec_cmd('qemu-img create -f qcow2 %s %s' % (disk_path, disk_size)) + exec_cmd('qemu-img create -f raw %s %s' % (disk_path, disk_size)) def create_vms(self): temp_dir = tempfile.mkdtemp() diff --git a/deploy/environments/virtual_fuel.py b/deploy/environments/virtual_fuel.py index b1a76e479..5ddd93b51 100644 --- a/deploy/environments/virtual_fuel.py +++ b/deploy/environments/virtual_fuel.py @@ -87,7 +87,7 @@ class VirtualFuel(ExecutionEnvironment): else: err('No devices!') - def create_volume(self, pool, name, su, img_type='qcow2'): + def create_volume(self, pool, name, su, img_type='raw'): log('Creating image using Libvirt volumes in pool %s, name: %s' % (pool, name)) size, unit = get_size_and_unit(su) @@ -109,7 +109,7 @@ class VirtualFuel(ExecutionEnvironment): def create_image(self, disk_path, disk_size): if os.environ.get('LIBVIRT_DEFAULT_URI') == None: - exec_cmd('qemu-img create -f qcow2 %s %s' % (disk_path, disk_size)) + exec_cmd('qemu-img create -f raw %s %s' % (disk_path, disk_size)) else: pool = DEFAULT_POOL # FIXME name = os.path.basename(disk_path) diff --git a/deploy/templates/hardware_environment/vms/enea_lab/fuel.xml b/deploy/templates/hardware_environment/vms/enea_lab/fuel.xml index 15617f577..5a59ace86 100644 --- a/deploy/templates/hardware_environment/vms/enea_lab/fuel.xml +++ b/deploy/templates/hardware_environment/vms/enea_lab/fuel.xml @@ -35,7 +35,7 @@ <devices> <emulator>/usr/libexec/qemu-kvm</emulator> <disk type='file' device='disk'> - <driver name='qemu' type='qcow2' cache='writeback'/> + <driver name='qemu' type='raw' cache='none' io='native'/> <target dev='vda' bus='virtio'/> </disk> <disk type='block' device='cdrom'> diff --git a/deploy/templates/hardware_environment/vms/ericsson_montreal_lab/fuel.xml b/deploy/templates/hardware_environment/vms/ericsson_montreal_lab/fuel.xml index fe547b811..055923037 100644 --- a/deploy/templates/hardware_environment/vms/ericsson_montreal_lab/fuel.xml +++ b/deploy/templates/hardware_environment/vms/ericsson_montreal_lab/fuel.xml @@ -35,7 +35,7 @@ <devices> <emulator>/usr/bin/kvm</emulator> <disk type='file' device='disk'> - <driver name='qemu' type='qcow2'/> + <driver name='qemu' type='raw' cache='none' io='native'/> <target dev='vda' bus='virtio'/> </disk> <disk type='block' device='cdrom'> diff --git a/deploy/templates/hardware_environment/vms/fuel.xml b/deploy/templates/hardware_environment/vms/fuel.xml index 8d8dd4494..ada7688c2 100644 --- a/deploy/templates/hardware_environment/vms/fuel.xml +++ b/deploy/templates/hardware_environment/vms/fuel.xml @@ -35,7 +35,7 @@ <devices> <emulator>/usr/libexec/qemu-kvm</emulator> <disk type='file' device='disk'> - <driver name='qemu' type='qcow2'/> + <driver name='qemu' type='raw' cache='none' io='native'/> <target dev='vda' bus='virtio'/> </disk> <disk type='block' device='cdrom'> diff --git a/deploy/templates/virtual_environment/vms/compute.xml b/deploy/templates/virtual_environment/vms/compute.xml index 0bff88827..0f8a0379b 100644 --- a/deploy/templates/virtual_environment/vms/compute.xml +++ b/deploy/templates/virtual_environment/vms/compute.xml @@ -24,7 +24,7 @@ <devices> <emulator>/usr/bin/kvm</emulator> <disk type='file' device='disk'> - <driver name='qemu' type='qcow2'/> + <driver name='qemu' type='raw' cache='none' io='native'/> <source file='disk.raw'/> <target dev='vda' bus='virtio'/> </disk> diff --git a/deploy/templates/virtual_environment/vms/controller.xml b/deploy/templates/virtual_environment/vms/controller.xml index 422aa39e2..8e239cb70 100644 --- a/deploy/templates/virtual_environment/vms/controller.xml +++ b/deploy/templates/virtual_environment/vms/controller.xml @@ -21,7 +21,7 @@ <devices> <emulator>/usr/bin/kvm</emulator> <disk type='file' device='disk'> - <driver name='qemu' type='qcow2'/> + <driver name='qemu' type='raw' cache='none' io='native'/> <source file='disk.raw'/> <target dev='vda' bus='virtio'/> </disk> diff --git a/deploy/templates/virtual_environment/vms/fuel.xml b/deploy/templates/virtual_environment/vms/fuel.xml index e2a05d86e..5be6d398e 100644 --- a/deploy/templates/virtual_environment/vms/fuel.xml +++ b/deploy/templates/virtual_environment/vms/fuel.xml @@ -29,7 +29,7 @@ <readonly/> </disk> <disk type='file' device='disk'> - <driver name='qemu' type='qcow2'/> + <driver name='qemu' type='raw' cache='none' io='native'/> <source file='disk.raw'/> <target dev='vda' bus='virtio'/> </disk> |