From b61e2f1ae406436dcaf36f6fb3d2bb9189eebb13 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Wed, 23 Apr 2025 15:41:02 +0000 Subject: [PATCH 1/2] fix fatimage build without secrets --- environments/common/inventory/group_vars/all/prometheus.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/environments/common/inventory/group_vars/all/prometheus.yml b/environments/common/inventory/group_vars/all/prometheus.yml index 6c40e66bb..f4587e672 100644 --- a/environments/common/inventory/group_vars/all/prometheus.yml +++ b/environments/common/inventory/group_vars/all/prometheus.yml @@ -15,7 +15,9 @@ prometheus_alertmanager_config_default: - "{{ alertmanager_address }}:{{ alertmanager_port }}" basic_auth: username: alertmanager - password: "{{ vault_alertmanager_admin_password }}" + # cloudalchemy.prometheus/preflight checks this config so it must be + # templatable even during build when it is not used + password: "{{ vault_alertmanager_admin_password | default('UNDEFINED') }}" prometheus_alertmanager_config_extra: [] prometheus_alertmanager_config: "{{ (prometheus_alertmanager_config_default if groups['alertmanager'] else []) + prometheus_alertmanager_config_extra }}" From 6225b7fdb9e16e89a2fc5b42366c07aaab48121a Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Thu, 24 Apr 2025 08:42:20 +0000 Subject: [PATCH 2/2] 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 56d3e237c..37fa04c35 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-250422-1328-1a6eff86", - "RL9": "openhpc-RL9-250422-1328-1a6eff86" + "RL8": "openhpc-RL8-250423-1606-b61e2f1a", + "RL9": "openhpc-RL9-250423-1606-b61e2f1a" } }