Run ovftool from packer build

cloud-images-build.sh

@@ -60,18 +60,10 @@ CheckSource "$SOURCE" || { echo "Unknown source: $SOURCE"; exit 1; }
 
 if [ -z "$NO_PKG_INSTALL" ]; then
 	if which dnf &>/dev/null; then
-		sudo dnf install edk2-ovmf libvirt libvirt-daemon-kvm ansible-core
+		sudo dnf install edk2-ovmf libvirt libvirt-daemon-kvm ansible-core libnsl
 	fi
 fi
 
 [ -z "$NO_PAKER_INIT" ] && $PACKER init -upgrade . || exit 1
 
 PACKER_LOG=1 $PACKER build  -only=$SOURCE . 2>$PACKER_LOG_FILE || exit 1
-
-if [ "$SOURCE" = "vmware-iso.msvsphere-9-ovf-x86_64" ]; then
-	OUT_DIR='./vmware-iso.msvsphere-9-ovf-x86_64_ovf'
-	rm -rf $OUT_DIR
-	mkdir $OUT_DIR
-
-	/usr/lib/vmware-ovftool/ovftool --machineOutput --X:logFile=./ovftool.log --X:logLevel=verbose --exportFlags=extraconfig --allowExtraConfig --X:vCloudEnableGuestCustomization ./output-msvsphere-9-ovf-x86_64/msvsphere-9.4.vmx $OUT_DIR || exit 1
-fi

msvsphere-9-ovf.pkr.hcl

@@ -3,7 +3,7 @@
  */
 
 source "vmware-iso" "msvsphere-9-ovf-x86_64" {
-  vm_name = "msvsphere-9.4"
+  vm_name          = "MSVSphere-${var.os_version_9}-${formatdate("YYYYMMDD", timestamp())}.ovf.x86_64"
   iso_url          = var.iso_url_9_x86_64
   iso_checksum     = var.iso_checksum_9_x86_64
   boot_command       = var.ovf_boot_cmd_9_x86_64_bios
@@ -49,4 +49,11 @@ build {
       "packer_provider=${source.type}"
     ]
   }
+
+  post-processor "shell-local"{
+    inline = ["rm -rf vmware-iso.msvsphere-9-ovf-x86_64_ovf",
+              "mkdir vmware-iso.msvsphere-9-ovf-x86_64_ovf",
+              "/usr/lib/vmware-ovftool/ovftool --machineOutput --X:logFile=./ovftool.log --X:logLevel=verbose --exportFlags=extraconfig --allowExtraConfig --X:vCloudEnableGuestCustomization ./output-msvsphere-9-ovf-x86_64/MSVSphere-${var.os_version_9}-${formatdate("YYYYMMDD", timestamp())}.ovf.x86_64.vmx ./vmware-iso.msvsphere-9-ovf-x86_64_ovf"
+    ]
+  }
 }

variables.pkr.hcl

@@ -97,21 +97,21 @@ variable "uefi_ovmf_code" {
   description = "QEMU/KVM UEFI firmware path"
   type        = string
   // on Fedora use "/usr/share/OVMF/OVMF_CODE.fd"
-  default     = "/usr/share/edk2/ovmf/OVMF_CODE.fd"
+  default     = "/usr/share/OVMF/OVMF_CODE.fd"
 }
 
 variable "uefi_ovmf_vars" {
   description = "QEMU/KVM UEFI firmware variables path"
   type        = string
   // on Fedora use "/usr/share/OVMF/OVMF_VARS.fd"
-  default     = "/usr/share/edk2/ovmf/OVMF_VARS.fd"
+  default     = "/usr/share/OVMF/OVMF_VARS.fd"
 }
 
 variable "qemu_binary" {
   description = "QEMU binary path"
   type        = string
   // on Fedora use "/usr/bin/qemu-kvm"
-  default     = "/usr/libexec/qemu-kvm"
+  default     = "/usr/bin/qemu-kvm"
 }
 
 /**