From 357726028bf8ff6c9c1c54cf76b64cbd3c28b9b2 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. --- environments/site/inventory/groups | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/environments/site/inventory/groups b/environments/site/inventory/groups index 09c54aa54..a2a4f00d8 100644 --- a/environments/site/inventory/groups +++ b/environments/site/inventory/groups @@ -161,8 +161,9 @@ fatimage [lustre] # Hosts to run lustre client -[extra_packages] -# Hosts to install specified additional packages on +[extra_packages:children] +# Groups to install specified additional packages on +fatimage [dnf_repos:children] # Hosts to replace system repos with Pulp repos From ece6d7777267e0adc97e11101b3183ffaa4b4cfa 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 2cbda01d91cb1a25147ef0415804cc632e8c50b2 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 Workflow: https://github.com/stackhpc/ansible-slurm-appliance/actions/runs/20095164635 --- 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..bf04d9c9e 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-251210-1021-42a63cab", + "RL9": "openhpc-RL9-251210-1020-42a63cab" } }