From 7a40a08dd45614c70e7e4e581c969efd19693bb3 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Tue, 24 Oct 2023 09:04:45 +0000 Subject: [PATCH 1/4] bump image --- roles/community_images/defaults/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/community_images/defaults/main.yml b/roles/community_images/defaults/main.yml index 6d291dce..eddbc101 100644 --- a/roles/community_images/defaults/main.yml +++ b/roles/community_images/defaults/main.yml @@ -74,13 +74,13 @@ community_images_azimuth_images: |- {% endfor %} } -# Slurm images are published by the slurm_image_builder repo - https://github.com/stackhpc/slurm_image_builder +# Slurm images are published by the ansible-slurm-appliance repo - https://github.com/stackhpc/ansible-slurm-appliance/ community_images_slurm_base_url: >- https://object.arcus.openstack.hpc.cam.ac.uk/swift/v1/AUTH_3a06571936a0424bb40bc5c672c4ccb1/openhpc-images community_images_slurm: openhpc: - name: openhpc-230811-1548-a49164d1 - source_url: "{{ community_images_slurm_base_url }}/openhpc-230811-1548-a49164d1" + name: openhpc-231020-1357-b5d8b056 # https://github.com/stackhpc/ansible-slurm-appliance/pull/320 + source_url: "{{ community_images_slurm_base_url }}/openhpc-231020-1357-b5d8b056" source_disk_format: qcow2 container_format: bare From 26b7bba13319f6f475ed125b6b090234df965f02 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Tue, 24 Oct 2023 09:26:25 +0000 Subject: [PATCH 2/4] bump caas version (dev) --- roles/azimuth_caas_operator/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/azimuth_caas_operator/defaults/main.yml b/roles/azimuth_caas_operator/defaults/main.yml index 9afdc4ef..7fecc936 100644 --- a/roles/azimuth_caas_operator/defaults/main.yml +++ b/roles/azimuth_caas_operator/defaults/main.yml @@ -79,7 +79,7 @@ azimuth_caas_stackhpc_slurm_appliance_enabled: "{{ azimuth_clusters_enabled }}" # The git URL for the StackHPC Slurm appliance azimuth_caas_stackhpc_slurm_appliance_git_url: https://github.com/stackhpc/caas-slurm-appliance.git # The git version for the StackHPC Slurm appliance -azimuth_caas_stackhpc_slurm_appliance_git_version: 39974da77613c5d12696c53cdfde43c3255e575c +azimuth_caas_stackhpc_slurm_appliance_git_version: fix/slurm-cve-2023-41914 # The playbook to use for the StackHPC Slurm appliance azimuth_caas_stackhpc_slurm_appliance_playbook: slurm-infra.yml # The metadata root for the StackHPC Slurm appliance From fe304195ef3930366e0b184631ef2adb4c390b83 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Tue, 24 Oct 2023 14:32:51 +0000 Subject: [PATCH 3/4] apply slurm CVE fix --- roles/azimuth_caas_operator/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/azimuth_caas_operator/defaults/main.yml b/roles/azimuth_caas_operator/defaults/main.yml index 7fecc936..16d26e67 100644 --- a/roles/azimuth_caas_operator/defaults/main.yml +++ b/roles/azimuth_caas_operator/defaults/main.yml @@ -77,7 +77,7 @@ azimuth_caas_operator_default_ssh_secret_files: {} # Indicates if the StackHPC Slurm appliance should be enabled azimuth_caas_stackhpc_slurm_appliance_enabled: "{{ azimuth_clusters_enabled }}" # The git URL for the StackHPC Slurm appliance -azimuth_caas_stackhpc_slurm_appliance_git_url: https://github.com/stackhpc/caas-slurm-appliance.git +azimuth_caas_stackhpc_slurm_appliance_git_url: https://github.com/stackhpc/caas-slurm-appliance.git # TODO: fix URL # The git version for the StackHPC Slurm appliance azimuth_caas_stackhpc_slurm_appliance_git_version: fix/slurm-cve-2023-41914 # The playbook to use for the StackHPC Slurm appliance From 6ebc91b91f2ddbb199762b4ffafc30264d18477f Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Wed, 25 Oct 2023 09:22:24 +0000 Subject: [PATCH 4/4] bump caas git version after PR merge --- roles/azimuth_caas_operator/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/azimuth_caas_operator/defaults/main.yml b/roles/azimuth_caas_operator/defaults/main.yml index 16d26e67..71255479 100644 --- a/roles/azimuth_caas_operator/defaults/main.yml +++ b/roles/azimuth_caas_operator/defaults/main.yml @@ -77,9 +77,9 @@ azimuth_caas_operator_default_ssh_secret_files: {} # Indicates if the StackHPC Slurm appliance should be enabled azimuth_caas_stackhpc_slurm_appliance_enabled: "{{ azimuth_clusters_enabled }}" # The git URL for the StackHPC Slurm appliance -azimuth_caas_stackhpc_slurm_appliance_git_url: https://github.com/stackhpc/caas-slurm-appliance.git # TODO: fix URL +azimuth_caas_stackhpc_slurm_appliance_git_url: https://github.com/stackhpc/caas-slurm-appliance.git # The git version for the StackHPC Slurm appliance -azimuth_caas_stackhpc_slurm_appliance_git_version: fix/slurm-cve-2023-41914 +azimuth_caas_stackhpc_slurm_appliance_git_version: 59d1b299f47404ca50283b31bf2508830052c3bf # merged https://github.com/stackhpc/caas-slurm-appliance/pull/42 # The playbook to use for the StackHPC Slurm appliance azimuth_caas_stackhpc_slurm_appliance_playbook: slurm-infra.yml # The metadata root for the StackHPC Slurm appliance