From c85d413c12a0edb83e37e33e7bcc2fe481171aae Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Fri, 9 Feb 2024 16:23:03 +0000 Subject: [PATCH 1/5] remove mention of home share from slurm-infra UI --- environments/.caas/ui-meta/slurm-infra.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/.caas/ui-meta/slurm-infra.yml b/environments/.caas/ui-meta/slurm-infra.yml index a34fa3f79..36ee476ab 100644 --- a/environments/.caas/ui-meta/slurm-infra.yml +++ b/environments/.caas/ui-meta/slurm-infra.yml @@ -52,7 +52,7 @@ parameters: - name: home_volume_size label: Home volume size (GB) - description: The size of the cloud volume or share to use for home directories. + description: The size of the cloud volume to use for home directories. kind: cloud.volume_size immutable: true options: From ba263cfd09064a2f7231e7904a41f12ea4c5d922 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Tue, 13 Feb 2024 11:19:17 +0000 Subject: [PATCH 2/5] allow caas to mount manila shares with more than one access rule --- environments/.caas/inventory/group_vars/all/manila.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/environments/.caas/inventory/group_vars/all/manila.yml b/environments/.caas/inventory/group_vars/all/manila.yml index deb1b4433..baccd353a 100644 --- a/environments/.caas/inventory/group_vars/all/manila.yml +++ b/environments/.caas/inventory/group_vars/all/manila.yml @@ -8,6 +8,7 @@ caas_manila_home: cluster_project_manila_share_name: azimuth-project-share caas_manila_project: share_name: "{{ cluster_project_manila_share_name }}" + share_user: "{{ cluster_project_manila_share_user }}" mount_path: /project mount_user: root mount_group: root From cabf10b379ac24cdd66a71ced6edd2b5a2feda65 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Tue, 13 Feb 2024 11:52:44 +0000 Subject: [PATCH 3/5] fallback to autodetection of share_user if cluster_project_manila_share_user not defined --- environments/.caas/inventory/group_vars/all/manila.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/.caas/inventory/group_vars/all/manila.yml b/environments/.caas/inventory/group_vars/all/manila.yml index baccd353a..12263bd3a 100644 --- a/environments/.caas/inventory/group_vars/all/manila.yml +++ b/environments/.caas/inventory/group_vars/all/manila.yml @@ -8,7 +8,7 @@ caas_manila_home: cluster_project_manila_share_name: azimuth-project-share caas_manila_project: share_name: "{{ cluster_project_manila_share_name }}" - share_user: "{{ cluster_project_manila_share_user }}" + share_user: "{{ cluster_project_manila_share_user | default(omit) }}" mount_path: /project mount_user: root mount_group: root From 82b848145dc49e6dd40845a99de189158e09fcee Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Tue, 13 Feb 2024 11:58:52 +0000 Subject: [PATCH 4/5] allow cluster_project_manila_share_name to be undefined --- environments/.caas/inventory/group_vars/all/manila.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/.caas/inventory/group_vars/all/manila.yml b/environments/.caas/inventory/group_vars/all/manila.yml index 12263bd3a..79ab31b9c 100644 --- a/environments/.caas/inventory/group_vars/all/manila.yml +++ b/environments/.caas/inventory/group_vars/all/manila.yml @@ -7,7 +7,7 @@ caas_manila_home: cluster_project_manila_share_name: azimuth-project-share caas_manila_project: - share_name: "{{ cluster_project_manila_share_name }}" + share_name: "{{ cluster_project_manila_share_name | default(none) }}" share_user: "{{ cluster_project_manila_share_user | default(omit) }}" mount_path: /project mount_user: root From 29c2b5cc25ca3628d8468d83b0bf9d8d62a1c438 Mon Sep 17 00:00:00 2001 From: John Garbutt Date: Wed, 14 Feb 2024 10:46:19 +0000 Subject: [PATCH 5/5] Update manila.yml --- environments/.caas/inventory/group_vars/all/manila.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/.caas/inventory/group_vars/all/manila.yml b/environments/.caas/inventory/group_vars/all/manila.yml index 79ab31b9c..226ac210a 100644 --- a/environments/.caas/inventory/group_vars/all/manila.yml +++ b/environments/.caas/inventory/group_vars/all/manila.yml @@ -7,7 +7,7 @@ caas_manila_home: cluster_project_manila_share_name: azimuth-project-share caas_manila_project: - share_name: "{{ cluster_project_manila_share_name | default(none) }}" + share_name: "{{ cluster_project_manila_share_name | default('azimuth-project-share') }}" share_user: "{{ cluster_project_manila_share_user | default(omit) }}" mount_path: /project mount_user: root