From 54f7a38bd60f6d2b1266dc5c9e034f838180c7b3 Mon Sep 17 00:00:00 2001 From: Eric Le Lay Date: Mon, 1 Dec 2025 11:35:06 +0100 Subject: [PATCH 1/3] fix extra_packages not in released fatimages eg htop is not in the 2.7 image openhpc-RL9-250925-1639-62d67ae3. If a site wants to avoid a particular package from appliances_extra_packages_default, they can override appliances_extra_packages_default in their site group_vars --- environments/common/inventory/groups | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/environments/common/inventory/groups b/environments/common/inventory/groups index 92c6c849c..2375a4bab 100644 --- a/environments/common/inventory/groups +++ b/environments/common/inventory/groups @@ -202,6 +202,10 @@ k3s_agent [extra_packages] # Hosts to install specified additional packages on +[extra_packages:children] +# To include extra packages in base image +fatimage + [dnf_repos:children] # Hosts to replace system repos with Pulp repos # Roles/groups listed here *always* do installs: From 3360093cf05015bb7e5c70151a332eac924762d9 Mon Sep 17 00:00:00 2001 From: Eric Le Lay Date: Mon, 1 Dec 2025 11:35:55 +0100 Subject: [PATCH 2/3] doc/image-build.md: rephrase PKR_VAR_environment_root because we don't show it anymore --- docs/image-build.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/image-build.md b/docs/image-build.md index 69e2a4d2d..a2de7d956 100644 --- a/docs/image-build.md +++ b/docs/image-build.md @@ -150,9 +150,10 @@ In summary, Packer creates an OpenStack VM, runs Ansible on that, shuts it down, Many of the Packer variables defined in `openstack.pkr.hcl` control the definition of the build VM and how to SSH to it to run Ansible. These are generic OpenStack builder options and are not specific to the Slurm Appliance. Packer variables can be set in a file at any convenient path; the build example above -shows the use of the environment variable `$PKR_VAR_environment_root` (which itself sets the Packer variable -`environment_root`) to automatically select a variable file from the current environment, but for site-specific builds -using a path in a "parent" environment is likely to be more appropriate (as builds should not be environment-specific to allow testing before deployment to a production environment). +shows the use of a path in the **site** environment. This is the most appropriate as builds should be tested in **dev** or **staging** before deployment to a production environment. + +During stackhpc CI image builds, the environment variable `$PKR_VAR_environment_root` (which itself sets the Packer variable +`environment_root`) is used to automatically select a variable file from the current environment; see `.github/workflows/fatimage.yml`. What is Slurm Appliance-specific are the details of how Ansible is run: From f4f5de7b827cfbb7c52044996af6ce3e1098cfd3 Mon Sep 17 00:00:00 2001 From: Eric Le Lay Date: Mon, 1 Dec 2025 15:49:34 +0100 Subject: [PATCH 3/3] Bump CI image --- environments/.stackhpc/tofu/cluster_image.auto.tfvars.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json index 86f4ac41b..a4f45a26f 100644 --- a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json +++ b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json @@ -1,6 +1,6 @@ { "cluster_image": { - "RL8": "openhpc-RL8-251119-1833-cb477455", - "RL9": "openhpc-RL9-251119-1834-cb477455" + "RL8": "openhpc-RL8-251204-1142-3aeb133e", + "RL9": "openhpc-RL9-251204-1142-3aeb133e" } }