diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6ff6e1d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.swp diff --git a/iso/empanadas/empanadas/common.py b/iso/empanadas/empanadas/common.py index fa7c806..ee32228 100644 --- a/iso/empanadas/empanadas/common.py +++ b/iso/empanadas/empanadas/common.py @@ -106,7 +106,7 @@ ALLOWED_TYPE_VARIANTS = { "Container": ["Base", "Minimal", "UBI"], "EC2": None, "GenericCloud": None, - "Vagrant": ["Libvirt", "VBox"] + "Vagrant": ["Libvirt", "Vbox"] } def valid_type_variant(_type: str, variant: str="") -> bool: if _type not in ALLOWED_TYPE_VARIANTS: diff --git a/iso/empanadas/empanadas/scripts/build_image.py b/iso/empanadas/empanadas/scripts/build_image.py index 508f99c..5085253 100644 --- a/iso/empanadas/empanadas/scripts/build_image.py +++ b/iso/empanadas/empanadas/scripts/build_image.py @@ -116,7 +116,7 @@ class ImageBuild: # ["qemu-img", "convert", "-f", "raw", "-o", "subformat=fixed,force_size" ,"-O", "vpc", lambda: f"{STORAGE_DIR}/{self.target_uuid}.body", f"{self.outdir}/{self.outname}.vhd"] if self.image_type in ["Vagrant"]: _map = { - "VBox": "vmdk", + "Vbox": "vmdk", "Libvirt": "qcow2" } output = f"{_map[self.variant]}" #type: ignore @@ -126,7 +126,7 @@ class ImageBuild: if self.stage_commands: - self.stage_commands += ["cp", "-v", lambda: f"{STORAGE_DIR}/{self.target_uuid}.meta", f"{self.outdir}/build.meta"] + self.stage_commands.append(["cp", "-v", lambda: f"{STORAGE_DIR}/{self.target_uuid}.meta", f"{self.outdir}/build.meta"]) try: os.mkdir(self.outdir) @@ -263,7 +263,7 @@ class ImageBuild: def package(self) -> int: # Some build types don't need to be packaged by imagefactory # @TODO remove business logic if possible - if self.image_type in ["GenericCloud", "EC2", "Azure"]: + if self.image_type in ["GenericCloud", "EC2", "Azure", "Vagrant"]: self.target_uuid = self.base_uuid if hasattr(self, 'base_uuid') else "" if self.target_uuid: