From 37c439621a38ed90e9ba63e133ca9ebb28afeeea Mon Sep 17 00:00:00 2001 From: AJ Schroeder <6432150+ajschroeder@users.noreply.github.com> Date: Fri, 12 Jul 2024 15:24:17 -0500 Subject: [PATCH] feat: update var defaults and descriptions --- builds/linux/centos/9-stream/variables.pkr.hcl | 7 +++++-- builds/linux/debian/11/variables.pkr.hcl | 5 ++++- builds/linux/debian/12/variables.pkr.hcl | 5 ++++- builds/linux/opensuse/leap-15-5/variables.pkr.hcl | 7 +++++-- builds/linux/opensuse/leap-15-6/variables.pkr.hcl | 9 ++++++--- builds/linux/rocky/8/variables.pkr.hcl | 7 +++++-- builds/linux/rocky/9/variables.pkr.hcl | 7 +++++-- builds/linux/ubuntu/20-04-lts/variables-network.pkr.hcl | 2 +- builds/linux/ubuntu/20-04-lts/variables.pkr.hcl | 5 ++++- builds/linux/ubuntu/22-04-lts/variables-network.pkr.hcl | 2 +- builds/linux/ubuntu/22-04-lts/variables-storage.pkr.hcl | 2 +- builds/linux/ubuntu/22-04-lts/variables.pkr.hcl | 5 ++++- builds/linux/ubuntu/24-04-lts/variables-network.pkr.hcl | 2 +- builds/linux/ubuntu/24-04-lts/variables.pkr.hcl | 5 ++++- 14 files changed, 50 insertions(+), 20 deletions(-) diff --git a/builds/linux/centos/9-stream/variables.pkr.hcl b/builds/linux/centos/9-stream/variables.pkr.hcl index 7ca551b..021fd86 100644 --- a/builds/linux/centos/9-stream/variables.pkr.hcl +++ b/builds/linux/centos/9-stream/variables.pkr.hcl @@ -1,6 +1,6 @@ /* DESCRIPTION: - CentOS Stream 9 variables using the Packer Builder for Proxmox (proxmox-iso). + CentOS 9 Stream variables using the Packer Builder for Proxmox (proxmox-iso). */ // BLOCK: variable @@ -80,7 +80,7 @@ variable "vm_os_type" { variable "vm_bios" { type = string description = "The firmware type. Allowed values 'ovmf' or 'seabios'" - default = "OVMF" + default = "ovmf" validation { condition = contains(["ovmf", "seabios"], var.vm_bios) @@ -97,16 +97,19 @@ variable "vm_firmware_path" { variable "vm_efi_storage_pool" { type = string description = "Set the UEFI disk storage location. (e.g. 'local-lvm')" + default = "local-lvm" } variable "vm_efi_type" { type = string description = "Specifies the version of the OVMF firmware to be used. (e.g. '4m')" + default = "4m" } variable "vm_efi_pre_enrolled_keys" { type = bool description = "Whether Microsoft Standard Secure Boot keys should be pre-loaded on the EFI disk. (e.g. false)" + default = false } variable "vm_cpu_count" { diff --git a/builds/linux/debian/11/variables.pkr.hcl b/builds/linux/debian/11/variables.pkr.hcl index 487e08c..c80568e 100644 --- a/builds/linux/debian/11/variables.pkr.hcl +++ b/builds/linux/debian/11/variables.pkr.hcl @@ -80,7 +80,7 @@ variable "vm_os_type" { variable "vm_bios" { type = string description = "The firmware type. Allowed values 'ovmf' or 'seabios'" - default = "OVMF" + default = "ovmf" validation { condition = contains(["ovmf", "seabios"], var.vm_bios) @@ -97,16 +97,19 @@ variable "vm_firmware_path" { variable "vm_efi_storage_pool" { type = string description = "Set the UEFI disk storage location. (e.g. 'local-lvm')" + default = "local-lvm" } variable "vm_efi_type" { type = string description = "Specifies the version of the OVMF firmware to be used. (e.g. '4m')" + default = "4m" } variable "vm_efi_pre_enrolled_keys" { type = bool description = "Whether Microsoft Standard Secure Boot keys should be pre-loaded on the EFI disk. (e.g. false)" + default = false } variable "vm_cpu_count" { diff --git a/builds/linux/debian/12/variables.pkr.hcl b/builds/linux/debian/12/variables.pkr.hcl index f5be19a..ca3b54a 100644 --- a/builds/linux/debian/12/variables.pkr.hcl +++ b/builds/linux/debian/12/variables.pkr.hcl @@ -80,7 +80,7 @@ variable "vm_os_type" { variable "vm_bios" { type = string description = "The firmware type. Allowed values 'ovmf' or 'seabios'" - default = "OVMF" + default = "ovmf" validation { condition = contains(["ovmf", "seabios"], var.vm_bios) @@ -97,16 +97,19 @@ variable "vm_firmware_path" { variable "vm_efi_storage_pool" { type = string description = "Set the UEFI disk storage location. (e.g. 'local-lvm')" + default = "local-lvm" } variable "vm_efi_type" { type = string description = "Specifies the version of the OVMF firmware to be used. (e.g. '4m')" + default = "4m" } variable "vm_efi_pre_enrolled_keys" { type = bool description = "Whether Microsoft Standard Secure Boot keys should be pre-loaded on the EFI disk. (e.g. false)" + default = false } variable "vm_cpu_count" { diff --git a/builds/linux/opensuse/leap-15-5/variables.pkr.hcl b/builds/linux/opensuse/leap-15-5/variables.pkr.hcl index 308258f..b5451e1 100644 --- a/builds/linux/opensuse/leap-15-5/variables.pkr.hcl +++ b/builds/linux/opensuse/leap-15-5/variables.pkr.hcl @@ -1,6 +1,6 @@ /* DESCRIPTION: - openSUSE-Leap 15.5 variables using the Packer Builder for Proxmox (proxmox-iso). + openSUSE Leap 15.5 variables using the Packer Builder for Proxmox (proxmox-iso). */ // BLOCK: variable @@ -80,7 +80,7 @@ variable "vm_os_type" { variable "vm_bios" { type = string description = "The firmware type. Allowed values 'ovmf' or 'seabios'" - default = "OVMF" + default = "ovmf" validation { condition = contains(["ovmf", "seabios"], var.vm_bios) @@ -97,16 +97,19 @@ variable "vm_firmware_path" { variable "vm_efi_storage_pool" { type = string description = "Set the UEFI disk storage location. (e.g. 'local-lvm')" + default = "local-lvm" } variable "vm_efi_type" { type = string description = "Specifies the version of the OVMF firmware to be used. (e.g. '4m')" + default = "4m" } variable "vm_efi_pre_enrolled_keys" { type = bool description = "Whether Microsoft Standard Secure Boot keys should be pre-loaded on the EFI disk. (e.g. false)" + default = false } variable "vm_cpu_count" { diff --git a/builds/linux/opensuse/leap-15-6/variables.pkr.hcl b/builds/linux/opensuse/leap-15-6/variables.pkr.hcl index 42574e8..54e0a69 100644 --- a/builds/linux/opensuse/leap-15-6/variables.pkr.hcl +++ b/builds/linux/opensuse/leap-15-6/variables.pkr.hcl @@ -1,6 +1,6 @@ /* DESCRIPTION: - openSUSE-Leap 15.6 variables using the Packer Builder for Proxmox (proxmox-iso). + openSUSE Leap 15.6 variables using the Packer Builder for Proxmox (proxmox-iso). */ // BLOCK: variable @@ -80,7 +80,7 @@ variable "vm_os_type" { variable "vm_bios" { type = string description = "The firmware type. Allowed values 'ovmf' or 'seabios'" - default = "OVMF" + default = "ovmf" validation { condition = contains(["ovmf", "seabios"], var.vm_bios) @@ -97,16 +97,19 @@ variable "vm_firmware_path" { variable "vm_efi_storage_pool" { type = string description = "Set the UEFI disk storage location. (e.g. 'local-lvm')" + default = "local-lvm" } variable "vm_efi_type" { type = string description = "Specifies the version of the OVMF firmware to be used. (e.g. '4m')" + default = "4m" } variable "vm_efi_pre_enrolled_keys" { type = bool description = "Whether Microsoft Standard Secure Boot keys should be pre-loaded on the EFI disk. (e.g. false)" + default = false } variable "vm_cpu_count" { @@ -301,4 +304,4 @@ variable "additional_packages" { type = list(string) description = "Additional packages to install." default = [] -} +} \ No newline at end of file diff --git a/builds/linux/rocky/8/variables.pkr.hcl b/builds/linux/rocky/8/variables.pkr.hcl index 0812cad..2989464 100644 --- a/builds/linux/rocky/8/variables.pkr.hcl +++ b/builds/linux/rocky/8/variables.pkr.hcl @@ -80,7 +80,7 @@ variable "vm_os_type" { variable "vm_bios" { type = string description = "The firmware type. Allowed values 'ovmf' or 'seabios'" - default = "OVMF" + default = "ovmf" validation { condition = contains(["ovmf", "seabios"], var.vm_bios) @@ -97,16 +97,19 @@ variable "vm_firmware_path" { variable "vm_efi_storage_pool" { type = string description = "Set the UEFI disk storage location. (e.g. 'local-lvm')" + default = "local-lvm" } variable "vm_efi_type" { type = string description = "Specifies the version of the OVMF firmware to be used. (e.g. '4m')" + default = "4m" } variable "vm_efi_pre_enrolled_keys" { type = bool description = "Whether Microsoft Standard Secure Boot keys should be pre-loaded on the EFI disk. (e.g. false)" + default = false } variable "vm_cpu_count" { @@ -301,4 +304,4 @@ variable "additional_packages" { type = list(string) description = "Additional packages to install." default = [] -} +} \ No newline at end of file diff --git a/builds/linux/rocky/9/variables.pkr.hcl b/builds/linux/rocky/9/variables.pkr.hcl index 12a2164..1751228 100644 --- a/builds/linux/rocky/9/variables.pkr.hcl +++ b/builds/linux/rocky/9/variables.pkr.hcl @@ -80,7 +80,7 @@ variable "vm_os_type" { variable "vm_bios" { type = string description = "The firmware type. Allowed values 'ovmf' or 'seabios'" - default = "OVMF" + default = "ovmf" validation { condition = contains(["ovmf", "seabios"], var.vm_bios) @@ -97,16 +97,19 @@ variable "vm_firmware_path" { variable "vm_efi_storage_pool" { type = string description = "Set the UEFI disk storage location. (e.g. 'local-lvm')" + default = "local-lvm" } variable "vm_efi_type" { type = string description = "Specifies the version of the OVMF firmware to be used. (e.g. '4m')" + default = "4m" } variable "vm_efi_pre_enrolled_keys" { type = bool description = "Whether Microsoft Standard Secure Boot keys should be pre-loaded on the EFI disk. (e.g. false)" + default = false } variable "vm_cpu_count" { @@ -301,4 +304,4 @@ variable "additional_packages" { type = list(string) description = "Additional packages to install." default = [] -} +} \ No newline at end of file diff --git a/builds/linux/ubuntu/20-04-lts/variables-network.pkr.hcl b/builds/linux/ubuntu/20-04-lts/variables-network.pkr.hcl index 1761446..7f8b505 100644 --- a/builds/linux/ubuntu/20-04-lts/variables-network.pkr.hcl +++ b/builds/linux/ubuntu/20-04-lts/variables-network.pkr.hcl @@ -1,6 +1,6 @@ /* DESCRIPTION: - Debian Linux 11 network variables used by the Packer Plugin for VMware vSphere (vsphere-iso). + Ubuntu 20.04 LTS network variables used by the Packer Plugin for Proxmox (proxmox-iso). */ // VM Network Settings diff --git a/builds/linux/ubuntu/20-04-lts/variables.pkr.hcl b/builds/linux/ubuntu/20-04-lts/variables.pkr.hcl index 6d1cf3e..3e89fed 100644 --- a/builds/linux/ubuntu/20-04-lts/variables.pkr.hcl +++ b/builds/linux/ubuntu/20-04-lts/variables.pkr.hcl @@ -80,7 +80,7 @@ variable "vm_os_type" { variable "vm_bios" { type = string description = "The firmware type. Allowed values 'ovmf' or 'seabios'" - default = "OVMF" + default = "ovmf" validation { condition = contains(["ovmf", "seabios"], var.vm_bios) @@ -97,16 +97,19 @@ variable "vm_firmware_path" { variable "vm_efi_storage_pool" { type = string description = "Set the UEFI disk storage location. (e.g. 'local-lvm')" + default = "local-lvm" } variable "vm_efi_type" { type = string description = "Specifies the version of the OVMF firmware to be used. (e.g. '4m')" + default = "4m" } variable "vm_efi_pre_enrolled_keys" { type = bool description = "Whether Microsoft Standard Secure Boot keys should be pre-loaded on the EFI disk. (e.g. false)" + default = false } variable "vm_cpu_count" { diff --git a/builds/linux/ubuntu/22-04-lts/variables-network.pkr.hcl b/builds/linux/ubuntu/22-04-lts/variables-network.pkr.hcl index 1761446..6122de3 100644 --- a/builds/linux/ubuntu/22-04-lts/variables-network.pkr.hcl +++ b/builds/linux/ubuntu/22-04-lts/variables-network.pkr.hcl @@ -1,6 +1,6 @@ /* DESCRIPTION: - Debian Linux 11 network variables used by the Packer Plugin for VMware vSphere (vsphere-iso). + Ubuntu 22.04 LTS network variables used by the Packer Plugin for Proxmox (proxmox-iso). */ // VM Network Settings diff --git a/builds/linux/ubuntu/22-04-lts/variables-storage.pkr.hcl b/builds/linux/ubuntu/22-04-lts/variables-storage.pkr.hcl index b1a1f41..5a27f6a 100644 --- a/builds/linux/ubuntu/22-04-lts/variables-storage.pkr.hcl +++ b/builds/linux/ubuntu/22-04-lts/variables-storage.pkr.hcl @@ -1,6 +1,6 @@ /* DESCRIPTION: - Ubuntu Server 22.04 LTS storage variables used by the Packer Plugin for VMware vSphere (vsphere-iso). + Ubuntu Server 22.04 LTS storage variables used by the Packer Plugin for Proxmox (proxmox-iso). */ // VM Storage Settings diff --git a/builds/linux/ubuntu/22-04-lts/variables.pkr.hcl b/builds/linux/ubuntu/22-04-lts/variables.pkr.hcl index 40950a2..7a9197a 100644 --- a/builds/linux/ubuntu/22-04-lts/variables.pkr.hcl +++ b/builds/linux/ubuntu/22-04-lts/variables.pkr.hcl @@ -80,7 +80,7 @@ variable "vm_os_type" { variable "vm_bios" { type = string description = "The firmware type. Allowed values 'ovmf' or 'seabios'" - default = "OVMF" + default = "ovmf" validation { condition = contains(["ovmf", "seabios"], var.vm_bios) @@ -97,16 +97,19 @@ variable "vm_firmware_path" { variable "vm_efi_storage_pool" { type = string description = "Set the UEFI disk storage location. (e.g. 'local-lvm')" + default = "local-lvm" } variable "vm_efi_type" { type = string description = "Specifies the version of the OVMF firmware to be used. (e.g. '4m')" + default = "4m" } variable "vm_efi_pre_enrolled_keys" { type = bool description = "Whether Microsoft Standard Secure Boot keys should be pre-loaded on the EFI disk. (e.g. false)" + default = false } variable "vm_cpu_count" { diff --git a/builds/linux/ubuntu/24-04-lts/variables-network.pkr.hcl b/builds/linux/ubuntu/24-04-lts/variables-network.pkr.hcl index 1761446..89df318 100644 --- a/builds/linux/ubuntu/24-04-lts/variables-network.pkr.hcl +++ b/builds/linux/ubuntu/24-04-lts/variables-network.pkr.hcl @@ -1,6 +1,6 @@ /* DESCRIPTION: - Debian Linux 11 network variables used by the Packer Plugin for VMware vSphere (vsphere-iso). + Ubuntu 24.04 LTS network variables used by the Packer Plugin for Proxmox (proxmox-iso). */ // VM Network Settings diff --git a/builds/linux/ubuntu/24-04-lts/variables.pkr.hcl b/builds/linux/ubuntu/24-04-lts/variables.pkr.hcl index 0022fcf..01f9028 100644 --- a/builds/linux/ubuntu/24-04-lts/variables.pkr.hcl +++ b/builds/linux/ubuntu/24-04-lts/variables.pkr.hcl @@ -80,7 +80,7 @@ variable "vm_os_type" { variable "vm_bios" { type = string description = "The firmware type. Allowed values 'ovmf' or 'seabios'" - default = "OVMF" + default = "ovmf" validation { condition = contains(["ovmf", "seabios"], var.vm_bios) @@ -97,16 +97,19 @@ variable "vm_firmware_path" { variable "vm_efi_storage_pool" { type = string description = "Set the UEFI disk storage location. (e.g. 'local-lvm')" + default = "local-lvm" } variable "vm_efi_type" { type = string description = "Specifies the version of the OVMF firmware to be used. (e.g. '4m')" + default = "4m" } variable "vm_efi_pre_enrolled_keys" { type = bool description = "Whether Microsoft Standard Secure Boot keys should be pre-loaded on the EFI disk. (e.g. false)" + default = false } variable "vm_cpu_count" {