From 59c3c6652a5cf3af6d7eede03adea5f25d92f98f Mon Sep 17 00:00:00 2001 From: bertiethorpe <84867280+bertiethorpe@users.noreply.github.com> Date: Thu, 9 Oct 2025 09:36:54 +0100 Subject: [PATCH 1/5] Bump OpenHPC role to v1.4.0 (#811) * Bump openhpc role to v1.4.0 * fix import role task name for ohpc install * Bump CI images --- ansible/fatimage.yml | 2 +- environments/.stackhpc/tofu/cluster_image.auto.tfvars.json | 4 ++-- requirements.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/fatimage.yml b/ansible/fatimage.yml index 7565af6f6..d811f53e8 100644 --- a/ansible/fatimage.yml +++ b/ansible/fatimage.yml @@ -117,7 +117,7 @@ - name: Install OpenHPC ansible.builtin.import_role: name: stackhpc.openhpc - tasks_from: install.yml + tasks_from: install-ohpc.yml when: "'openhpc' in group_names" # - import_playbook: portal.yml diff --git a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json index 585cfe235..2a3002567 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-251002-1537-1d21952c", - "RL9": "openhpc-RL9-251002-1456-1d21952c" + "RL8": "openhpc-RL8-251008-0814-cda7084d", + "RL9": "openhpc-RL9-251008-0814-cda7084d" } } diff --git a/requirements.yml b/requirements.yml index 27dbcbeba..13c6b77fe 100644 --- a/requirements.yml +++ b/requirements.yml @@ -4,7 +4,7 @@ roles: version: v25.3.2 name: stackhpc.nfs - src: https://github.com/stackhpc/ansible-role-openhpc.git - version: v1.3.0 + version: v1.4.0 name: stackhpc.openhpc - src: https://github.com/stackhpc/ansible-node-exporter.git version: stackhpc From 6c88173b1ce985439ab96a1fe7a19a50c55ad46f Mon Sep 17 00:00:00 2001 From: wtripp180901 <78219569+wtripp180901@users.noreply.github.com> Date: Thu, 9 Oct 2025 09:38:09 +0100 Subject: [PATCH 2/5] Export state directory to OnDemand nodes in CaaS environment (#809) * export state directory to ondemand nodes for caas * fixed caas config --- ansible/roles/zenith_proxy/tasks/main.yml | 2 ++ environments/.caas/inventory/group_vars/all/nfs.yml | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ansible/roles/zenith_proxy/tasks/main.yml b/ansible/roles/zenith_proxy/tasks/main.yml index 7a4c03413..360e77d54 100644 --- a/ansible/roles/zenith_proxy/tasks/main.yml +++ b/ansible/roles/zenith_proxy/tasks/main.yml @@ -61,6 +61,8 @@ group: "{{ zenith_proxy_podman_user }}" mode: "0755" become: true + delegate_to: "{{ groups['control'] | first }}" + run_once: true - name: Initialise Zenith client # Use a foreground command rather than the podman_container module as I could not diff --git a/environments/.caas/inventory/group_vars/all/nfs.yml b/environments/.caas/inventory/group_vars/all/nfs.yml index 0eca0c836..7d617dfe8 100644 --- a/environments/.caas/inventory/group_vars/all/nfs.yml +++ b/environments/.caas/inventory/group_vars/all/nfs.yml @@ -9,4 +9,12 @@ caas_nfs_home: nfs_export: "/exports/home" # assumes default site TF is being used nfs_client_mnt_point: "/home" -nfs_configurations: "{{ caas_nfs_home if not cluster_home_manila_share | bool else [] }}" +caas_ood_zenith_state_dir: + - comment: Export /var/lib/state from Slurm control node + nfs_enable: + server: "{{ inventory_hostname in groups['control'] }}" + clients: "{{ inventory_hostname in groups['openondemand'] }}" + nfs_export: "/var/lib/state" + nfs_client_mnt_point: "/var/lib/state" + +nfs_configurations: "{{ caas_ood_zenith_state_dir + ( caas_nfs_home if not cluster_home_manila_share | bool else [] ) }}" From 6d483b1a0d3de95ea3af91a6017dc202a51025fa Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Thu, 9 Oct 2025 08:40:29 +0000 Subject: [PATCH 3/5] move lint warnings to skip --- .ansible-lint.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.ansible-lint.yml b/.ansible-lint.yml index 97d3b687d..39864905c 100644 --- a/.ansible-lint.yml +++ b/.ansible-lint.yml @@ -6,8 +6,6 @@ skip_list: - jinja[spacing] - galaxy[no-changelog] - meta-runtime[unsupported-version] - -warn_list: - name[missing] - name[play] - var-naming From ba59ebc71cd2b9437e456206d07e26082c5171e8 Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Thu, 9 Oct 2025 08:42:25 +0000 Subject: [PATCH 4/5] dummy typo to test linter --- ansible/fatimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/fatimage.yml b/ansible/fatimage.yml index d811f53e8..7565af6f6 100644 --- a/ansible/fatimage.yml +++ b/ansible/fatimage.yml @@ -117,7 +117,7 @@ - name: Install OpenHPC ansible.builtin.import_role: name: stackhpc.openhpc - tasks_from: install-ohpc.yml + tasks_from: install.yml when: "'openhpc' in group_names" # - import_playbook: portal.yml From eb7b9baaaab131588b18be60488607c20e2aea03 Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Thu, 9 Oct 2025 10:15:17 +0000 Subject: [PATCH 5/5] revert dummy test --- ansible/fatimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/fatimage.yml b/ansible/fatimage.yml index 7565af6f6..d811f53e8 100644 --- a/ansible/fatimage.yml +++ b/ansible/fatimage.yml @@ -117,7 +117,7 @@ - name: Install OpenHPC ansible.builtin.import_role: name: stackhpc.openhpc - tasks_from: install.yml + tasks_from: install-ohpc.yml when: "'openhpc' in group_names" # - import_playbook: portal.yml