feat: add additional packages (#800)

Adds additional configuration to install packages for Linux Distributions. Signed-off-by: Stéphane Este-Gracias <[email protected]>
vmware-samples · Dec 18, 2023 · 7fee81c · 7fee81c
1 parent 4c9d59e
commit 7fee81c
Show file tree

Hide file tree

Showing 92 changed files with 316 additions and 72 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 :rocket: **Enhancement**:
 
 - Adds templates with unit tests for managing custom network and storage configurations for Linux Distributions. [GH-473](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/473)
+- Adds additional configuration to install packages for Linux Distributions. [GH-800](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/800)
 
 ## v23.11
 

diff --git a/builds/linux/almalinux/8/data/ks.pkrtpl.hcl b/builds/linux/almalinux/8/data/ks.pkrtpl.hcl
@@ -71,6 +71,9 @@ dnf makecache
 dnf install epel-release -y
 dnf makecache
 dnf install -y sudo open-vm-tools perl
+%{ if additional_packages != "" ~}
+dnf install -y ${additional_packages}
+%{ endif ~}
 echo "${build_username} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/${build_username}
 sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
 %end

diff --git a/builds/linux/almalinux/8/linux-almalinux.pkr.hcl b/builds/linux/almalinux/8/linux-almalinux.pkr.hcl
@@ -53,19 +53,20 @@ locals {
       vm_guest_os_language     = var.vm_guest_os_language
       vm_guest_os_keyboard     = var.vm_guest_os_keyboard
       vm_guest_os_timezone     = var.vm_guest_os_timezone
-      network                  = templatefile("${abspath(path.root)}/data/network.pkrtpl.hcl", {
+      network = templatefile("${abspath(path.root)}/data/network.pkrtpl.hcl", {
         device  = var.vm_network_device
         ip      = var.vm_ip_address
         netmask = var.vm_ip_netmask
         gateway = var.vm_ip_gateway
         dns     = var.vm_dns_list
       })
-      storage                  = templatefile("${abspath(path.root)}/data/storage.pkrtpl.hcl", {
+      storage = templatefile("${abspath(path.root)}/data/storage.pkrtpl.hcl", {
         device     = var.vm_disk_device
         swap       = var.vm_disk_use_swap
         partitions = var.vm_disk_partitions
         lvm        = var.vm_disk_lvm
       })
+      additional_packages = join(" ", var.additional_packages)
     })
   }
   data_source_command = var.common_data_source == "http" ? "inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg" : "inst.ks=cdrom:/ks.cfg"

diff --git a/builds/linux/almalinux/8/variables-storage.pkr.hcl b/builds/linux/almalinux/8/variables-storage.pkr.hcl
@@ -37,7 +37,7 @@ variable "vm_disk_partitions" {
 
 variable "vm_disk_lvm" {
   type = list(object({
-    name    = string
+    name = string
     partitions = list(object({
       name = string
       size = number

diff --git a/builds/linux/almalinux/8/variables.pkr.hcl b/builds/linux/almalinux/8/variables.pkr.hcl
@@ -395,3 +395,11 @@ variable "common_hcp_packer_registry_enabled" {
   description = "Enable the HCP Packer registry."
   default     = false
 }
+
+// Additional Settings
+
+variable "additional_packages" {
+  type        = list(string)
+  description = "Additional packages to install."
+  default     = []
+}
diff --git a/builds/linux/almalinux/9/data/ks.pkrtpl.hcl b/builds/linux/almalinux/9/data/ks.pkrtpl.hcl
@@ -71,6 +71,9 @@ dnf makecache
 dnf install epel-release -y
 dnf makecache
 dnf install -y sudo open-vm-tools perl
+%{ if additional_packages != "" ~}
+dnf install -y ${additional_packages}
+%{ endif ~}
 echo "${build_username} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/${build_username}
 sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
 %end

diff --git a/builds/linux/almalinux/9/linux-almalinux.pkr.hcl b/builds/linux/almalinux/9/linux-almalinux.pkr.hcl
@@ -53,19 +53,20 @@ locals {
       vm_guest_os_language     = var.vm_guest_os_language
       vm_guest_os_keyboard     = var.vm_guest_os_keyboard
       vm_guest_os_timezone     = var.vm_guest_os_timezone
-      network                  = templatefile("${abspath(path.root)}/data/network.pkrtpl.hcl", {
+      network = templatefile("${abspath(path.root)}/data/network.pkrtpl.hcl", {
         device  = var.vm_network_device
         ip      = var.vm_ip_address
         netmask = var.vm_ip_netmask
         gateway = var.vm_ip_gateway
         dns     = var.vm_dns_list
       })
-      storage                  = templatefile("${abspath(path.root)}/data/storage.pkrtpl.hcl", {
+      storage = templatefile("${abspath(path.root)}/data/storage.pkrtpl.hcl", {
         device     = var.vm_disk_device
         swap       = var.vm_disk_use_swap
         partitions = var.vm_disk_partitions
         lvm        = var.vm_disk_lvm
       })
+      additional_packages = join(" ", var.additional_packages)
     })
   }
   data_source_command = var.common_data_source == "http" ? "inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg" : "inst.ks=cdrom:/ks.cfg"

diff --git a/builds/linux/almalinux/9/variables-storage.pkr.hcl b/builds/linux/almalinux/9/variables-storage.pkr.hcl
@@ -37,7 +37,7 @@ variable "vm_disk_partitions" {
 
 variable "vm_disk_lvm" {
   type = list(object({
-    name    = string
+    name = string
     partitions = list(object({
       name = string
       size = number

diff --git a/builds/linux/almalinux/9/variables.pkr.hcl b/builds/linux/almalinux/9/variables.pkr.hcl
@@ -395,3 +395,11 @@ variable "common_hcp_packer_registry_enabled" {
   description = "Enable the HCP Packer registry."
   default     = false
 }
+
+// Additional Settings
+
+variable "additional_packages" {
+  type        = list(string)
+  description = "Additional packages to install."
+  default     = []
+}
diff --git a/builds/linux/centos/7/data/ks.pkrtpl.hcl b/builds/linux/centos/7/data/ks.pkrtpl.hcl
@@ -70,6 +70,9 @@ yum makecache
 yum install epel-release -y
 yum makecache
 yum install -y sudo open-vm-tools perl
+%{ if additional_packages != "" ~}
+yum install -y ${additional_packages}
+%{ endif ~}
 echo "${build_username} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/${build_username}
 sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
 %end

diff --git a/builds/linux/centos/7/linux-centos.pkr.hcl b/builds/linux/centos/7/linux-centos.pkr.hcl
@@ -53,19 +53,20 @@ locals {
       vm_guest_os_language     = var.vm_guest_os_language
       vm_guest_os_keyboard     = var.vm_guest_os_keyboard
       vm_guest_os_timezone     = var.vm_guest_os_timezone
-      network                  = templatefile("${abspath(path.root)}/data/network.pkrtpl.hcl", {
+      network = templatefile("${abspath(path.root)}/data/network.pkrtpl.hcl", {
         device  = var.vm_network_device
         ip      = var.vm_ip_address
         netmask = var.vm_ip_netmask
         gateway = var.vm_ip_gateway
         dns     = var.vm_dns_list
       })
-      storage                  = templatefile("${abspath(path.root)}/data/storage.pkrtpl.hcl", {
+      storage = templatefile("${abspath(path.root)}/data/storage.pkrtpl.hcl", {
         device     = var.vm_disk_device
         swap       = var.vm_disk_use_swap
         partitions = var.vm_disk_partitions
         lvm        = var.vm_disk_lvm
       })
+      additional_packages = join(" ", var.additional_packages)
     })
   }
   data_source_command = var.common_data_source == "http" ? "inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg" : "inst.ks=cdrom:/ks.cfg"

diff --git a/builds/linux/centos/7/variables-storage.pkr.hcl b/builds/linux/centos/7/variables-storage.pkr.hcl
@@ -37,7 +37,7 @@ variable "vm_disk_partitions" {
 
 variable "vm_disk_lvm" {
   type = list(object({
-    name    = string
+    name = string
     partitions = list(object({
       name = string
       size = number

diff --git a/builds/linux/centos/7/variables.pkr.hcl b/builds/linux/centos/7/variables.pkr.hcl
@@ -395,3 +395,11 @@ variable "common_hcp_packer_registry_enabled" {
   description = "Enable the HCP Packer registry."
   default     = false
 }
+
+// Additional Settings
+
+variable "additional_packages" {
+  type        = list(string)
+  description = "Additional packages to install."
+  default     = []
+}
diff --git a/builds/linux/centos/8-stream/data/ks.pkrtpl.hcl b/builds/linux/centos/8-stream/data/ks.pkrtpl.hcl
@@ -71,6 +71,9 @@ dnf makecache
 dnf install epel-release -y
 dnf makecache
 dnf install -y sudo open-vm-tools perl
+%{ if additional_packages != "" ~}
+dnf install -y ${additional_packages}
+%{ endif ~}
 echo "${build_username} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/${build_username}
 sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
 %end

diff --git a/builds/linux/centos/8-stream/linux-centos-stream.pkr.hcl b/builds/linux/centos/8-stream/linux-centos-stream.pkr.hcl
@@ -53,19 +53,20 @@ locals {
       vm_guest_os_language     = var.vm_guest_os_language
       vm_guest_os_keyboard     = var.vm_guest_os_keyboard
       vm_guest_os_timezone     = var.vm_guest_os_timezone
-      network                  = templatefile("${abspath(path.root)}/data/network.pkrtpl.hcl", {
+      network = templatefile("${abspath(path.root)}/data/network.pkrtpl.hcl", {
         device  = var.vm_network_device
         ip      = var.vm_ip_address
         netmask = var.vm_ip_netmask
         gateway = var.vm_ip_gateway
         dns     = var.vm_dns_list
       })
-      storage                  = templatefile("${abspath(path.root)}/data/storage.pkrtpl.hcl", {
+      storage = templatefile("${abspath(path.root)}/data/storage.pkrtpl.hcl", {
         device     = var.vm_disk_device
         swap       = var.vm_disk_use_swap
         partitions = var.vm_disk_partitions
         lvm        = var.vm_disk_lvm
       })
+      additional_packages = join(" ", var.additional_packages)
     })
   }
   data_source_command = var.common_data_source == "http" ? "inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg" : "inst.ks=cdrom:/ks.cfg"

diff --git a/builds/linux/centos/8-stream/variables-storage.pkr.hcl b/builds/linux/centos/8-stream/variables-storage.pkr.hcl
@@ -37,7 +37,7 @@ variable "vm_disk_partitions" {
 
 variable "vm_disk_lvm" {
   type = list(object({
-    name    = string
+    name = string
     partitions = list(object({
       name = string
       size = number

diff --git a/builds/linux/centos/8-stream/variables.pkr.hcl b/builds/linux/centos/8-stream/variables.pkr.hcl
@@ -395,3 +395,11 @@ variable "common_hcp_packer_registry_enabled" {
   description = "Enable the HCP Packer registry."
   default     = false
 }
+
+// Additional Settings
+
+variable "additional_packages" {
+  type        = list(string)
+  description = "Additional packages to install."
+  default     = []
+}
diff --git a/builds/linux/centos/9-stream/data/ks.pkrtpl.hcl b/builds/linux/centos/9-stream/data/ks.pkrtpl.hcl
@@ -71,6 +71,9 @@ dnf makecache
 dnf install epel-release -y
 dnf makecache
 dnf install -y sudo open-vm-tools perl
+%{ if additional_packages != "" ~}
+dnf install -y ${additional_packages}
+%{ endif ~}
 echo "${build_username} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/${build_username}
 sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
 %end

diff --git a/builds/linux/centos/9-stream/linux-centos-stream.pkr.hcl b/builds/linux/centos/9-stream/linux-centos-stream.pkr.hcl
@@ -53,19 +53,20 @@ locals {
       vm_guest_os_language     = var.vm_guest_os_language
       vm_guest_os_keyboard     = var.vm_guest_os_keyboard
       vm_guest_os_timezone     = var.vm_guest_os_timezone
-      network                  = templatefile("${abspath(path.root)}/data/network.pkrtpl.hcl", {
+      network = templatefile("${abspath(path.root)}/data/network.pkrtpl.hcl", {
         device  = var.vm_network_device
         ip      = var.vm_ip_address
         netmask = var.vm_ip_netmask
         gateway = var.vm_ip_gateway
         dns     = var.vm_dns_list
       })
-      storage                  = templatefile("${abspath(path.root)}/data/storage.pkrtpl.hcl", {
+      storage = templatefile("${abspath(path.root)}/data/storage.pkrtpl.hcl", {
         device     = var.vm_disk_device
         swap       = var.vm_disk_use_swap
         partitions = var.vm_disk_partitions
         lvm        = var.vm_disk_lvm
       })
+      additional_packages = join(" ", var.additional_packages)
     })
   }
   data_source_command = var.common_data_source == "http" ? "inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg" : "inst.ks=cdrom:/ks.cfg"

diff --git a/builds/linux/centos/9-stream/variables-storage.pkr.hcl b/builds/linux/centos/9-stream/variables-storage.pkr.hcl
@@ -37,7 +37,7 @@ variable "vm_disk_partitions" {
 
 variable "vm_disk_lvm" {
   type = list(object({
-    name    = string
+    name = string
     partitions = list(object({
       name = string
       size = number

diff --git a/builds/linux/centos/9-stream/variables.pkr.hcl b/builds/linux/centos/9-stream/variables.pkr.hcl
@@ -395,3 +395,11 @@ variable "common_hcp_packer_registry_enabled" {
   description = "Enable the HCP Packer registry."
   default     = false
 }
+
+// Additional Settings
+
+variable "additional_packages" {
+  type        = list(string)
+  description = "Additional packages to install."
+  default     = []
+}
diff --git a/builds/linux/debian/11/data/ks.pkrtpl.hcl b/builds/linux/debian/11/data/ks.pkrtpl.hcl
@@ -37,7 +37,7 @@ d-i passwd/user-password-crypted password ${build_password_encrypted}
 
 # Package Configuration
 d-i pkgsel/run_tasksel boolean false
-d-i pkgsel/include string openssh-server open-vm-tools python3-apt perl
+d-i pkgsel/include string openssh-server open-vm-tools python3-apt perl ${additional_packages}
 
 # Add User to Sudoers
 d-i preseed/late_command string \

diff --git a/builds/linux/debian/11/linux-debian.pkr.hcl b/builds/linux/debian/11/linux-debian.pkr.hcl
@@ -55,19 +55,20 @@ locals {
       vm_guest_os_keyboard     = var.vm_guest_os_keyboard
       vm_guest_os_timezone     = var.vm_guest_os_timezone
       common_data_source       = var.common_data_source
-      network                  = templatefile("${abspath(path.root)}/data/network.pkrtpl.hcl", {
+      network = templatefile("${abspath(path.root)}/data/network.pkrtpl.hcl", {
         device  = var.vm_network_device
         ip      = var.vm_ip_address
         netmask = var.vm_ip_netmask
         gateway = var.vm_ip_gateway
         dns     = var.vm_dns_list
       })
-      storage                  = templatefile("${abspath(path.root)}/data/storage.pkrtpl.hcl", {
+      storage = templatefile("${abspath(path.root)}/data/storage.pkrtpl.hcl", {
         device     = var.vm_disk_device
         swap       = var.vm_disk_use_swap
         partitions = var.vm_disk_partitions
         lvm        = var.vm_disk_lvm
       })
+      additional_packages = join(" ", var.additional_packages)
     })
   }
   data_source_command = var.common_data_source == "http" ? "url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg" : "file=/media/ks.cfg"

diff --git a/builds/linux/debian/11/variables-storage.pkr.hcl b/builds/linux/debian/11/variables-storage.pkr.hcl
@@ -37,7 +37,7 @@ variable "vm_disk_partitions" {
 
 variable "vm_disk_lvm" {
   type = list(object({
-    name    = string
+    name = string
     partitions = list(object({
       name = string
       size = number

diff --git a/builds/linux/debian/11/variables.pkr.hcl b/builds/linux/debian/11/variables.pkr.hcl
@@ -396,3 +396,11 @@ variable "common_hcp_packer_registry_enabled" {
   description = "Enable the HCP Packer registry."
   default     = false
 }
+
+// Additional Settings
+
+variable "additional_packages" {
+  type        = list(string)
+  description = "Additional packages to install."
+  default     = []
+}
diff --git a/builds/linux/debian/12/data/ks.pkrtpl.hcl b/builds/linux/debian/12/data/ks.pkrtpl.hcl
@@ -37,7 +37,7 @@ d-i passwd/user-password-crypted password ${build_password_encrypted}
 
 # Package Configuration
 d-i pkgsel/run_tasksel boolean false
-d-i pkgsel/include string openssh-server open-vm-tools python3-apt perl
+d-i pkgsel/include string openssh-server open-vm-tools python3-apt perl ${additional_packages}
 
 # Add User to Sudoers
 d-i preseed/late_command string \

diff --git a/builds/linux/debian/12/linux-debian.pkr.hcl b/builds/linux/debian/12/linux-debian.pkr.hcl
@@ -55,19 +55,20 @@ locals {
       vm_guest_os_keyboard     = var.vm_guest_os_keyboard
       vm_guest_os_timezone     = var.vm_guest_os_timezone
       common_data_source       = var.common_data_source
-      network                  = templatefile("${abspath(path.root)}/data/network.pkrtpl.hcl", {
+      network = templatefile("${abspath(path.root)}/data/network.pkrtpl.hcl", {
         device  = var.vm_network_device
         ip      = var.vm_ip_address
         netmask = var.vm_ip_netmask
         gateway = var.vm_ip_gateway
         dns     = var.vm_dns_list
       })
-      storage                  = templatefile("${abspath(path.root)}/data/storage.pkrtpl.hcl", {
+      storage = templatefile("${abspath(path.root)}/data/storage.pkrtpl.hcl", {
         device     = var.vm_disk_device
         swap       = var.vm_disk_use_swap
         partitions = var.vm_disk_partitions
         lvm        = var.vm_disk_lvm
       })
+      additional_packages = join(" ", var.additional_packages)
     })
   }
   data_source_command = var.common_data_source == "http" ? "url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg" : "file=/media/ks.cfg"

diff --git a/builds/linux/debian/12/variables-storage.pkr.hcl b/builds/linux/debian/12/variables-storage.pkr.hcl
@@ -38,7 +38,7 @@ variable "vm_disk_partitions" {
 
 variable "vm_disk_lvm" {
   type = list(object({
-    name    = string
+    name = string
     partitions = list(object({
       name = string
       size = number

diff --git a/builds/linux/debian/12/variables.pkr.hcl b/builds/linux/debian/12/variables.pkr.hcl
@@ -396,3 +396,11 @@ variable "common_hcp_packer_registry_enabled" {
   description = "Enable the HCP Packer registry."
   default     = false
 }
+
+// Additional Settings
+
+variable "additional_packages" {
+  type        = list(string)
+  description = "Additional packages to install."
+  default     = []
+}
diff --git a/builds/linux/oracle/8/data/ks.pkrtpl.hcl b/builds/linux/oracle/8/data/ks.pkrtpl.hcl
@@ -70,6 +70,9 @@ skipx
 dnf install -y oracle-epel-release-el8
 dnf makecache
 dnf install -y sudo open-vm-tools perl
+%{ if additional_packages != "" ~}
+dnf install -y ${additional_packages}
+%{ endif ~}
 echo "${build_username} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/${build_username}
 sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
 %end