From 4bf9c438776f0e2992334867575715af47b0892b Mon Sep 17 00:00:00 2001 From: fu-shanqing Date: Tue, 7 Mar 2023 11:31:33 +0800 Subject: [PATCH] support openstack --- src/cosalib/qemuvariants.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cosalib/qemuvariants.py b/src/cosalib/qemuvariants.py index 458ff68a..12950e5b 100644 --- a/src/cosalib/qemuvariants.py +++ b/src/cosalib/qemuvariants.py @@ -183,13 +183,13 @@ class QemuVariantImage(_Build): """ Return the path of the Qemu QCOW2 image from the meta-data """ - qemu_meta = self.meta.get_artifact_meta("qemu", unmerged=True) + qemu_meta = self.meta.get_artifact_meta("metal", unmerged=True) qimage = os.path.join( self.build_dir, - qemu_meta.get('images', {}).get('qemu', {}).get('path', None) + qemu_meta.get('images', {}).get('metal', {}).get('path', None) ) if not qimage: - raise ImageError("qemu image has not be built yet") + raise ImageError("metal image has not be built yet") elif not os.path.exists(qimage): raise ImageError(f"{qimage} does not exist") return qimage @@ -241,7 +241,7 @@ class QemuVariantImage(_Build): self.tmp_image, self.virtual_size] run_verbose(resize_cmd) - cmd = ['qemu-img', 'convert', '-f', 'qcow2', '-O', + cmd = ['qemu-img', 'convert', '-f', 'raw', '-O', self.image_format, self.tmp_image] for k, v in self.convert_options.items(): cmd.extend([k, v]) -- Gitee