Support ansible-init in slurm appliance (#588)

* add slurm extravars for ansible-init

* use WIP slurm branch for ansible-init

* fix ansible-init playbook definition

* fix workflow test now repo moved

* bump slurm image to v1.151

* bump slurm release to v1.151

roles/azimuth_caas_operator/defaults/main.yml

@@ -96,7 +96,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/ansible-slurm-appliance.git
 # The git version for the StackHPC Slurm appliance
-azimuth_caas_stackhpc_slurm_appliance_git_version: v1.150
+azimuth_caas_stackhpc_slurm_appliance_git_version: v1.151
 # The playbook to use for the StackHPC Slurm appliance
 azimuth_caas_stackhpc_slurm_appliance_playbook: ansible/site.yml
 # The timeout to apply to the k8s jobs which create, update & delete platform instances
@@ -128,10 +128,32 @@ azimuth_caas_stackhpc_slurm_appliance_image: >-
       )
     )
   }}
+# Combine default and any extra workstation ansible collections
+azimuth_caas_stackhpc_slurm_appliance_init_collections_default: >-
+  {{ ansible_init_default_collections | default([]) }}
+azimuth_caas_stackhpc_slurm_appliance_init_collections_extra: []
+azimuth_caas_stackhpc_slurm_appliance_init_collections: >-
+  {{
+    azimuth_caas_stackhpc_slurm_appliance_init_collections_default +
+    azimuth_caas_stackhpc_slurm_appliance_init_collections_extra
+  }}
+
+# Combine default and any extra workstation ansible playbooks
+azimuth_caas_stackhpc_slurm_appliance_init_playbooks_default: >-
+  {{ ansible_init_default_playbooks | default([]) }}
+azimuth_caas_stackhpc_slurm_appliance_init_playbooks_extra: []
+azimuth_caas_stackhpc_slurm_appliance_init_playbooks: >-
+  {{
+    azimuth_caas_stackhpc_slurm_appliance_init_playbooks_default + 
+    azimuth_caas_stackhpc_slurm_appliance_init_playbooks_extra
+  }}
+
 # The default extra vars for templates in the StackHPC Slurm appliance
 azimuth_caas_stackhpc_slurm_appliance_extra_vars_defaults:
   cluster_image: "{{ azimuth_caas_stackhpc_slurm_appliance_image }}"
   cluster_home_manila_share: "{{ azimuth_caas_stackhpc_slurm_appliance_home_manila_share }}"
+  ansible_init_collections: "{{ azimuth_caas_stackhpc_slurm_appliance_init_collections }}"
+  ansible_init_playbooks: "{{ azimuth_caas_stackhpc_slurm_appliance_init_playbooks }}"
 # extra_vars overrides for templates in the StackHPC Slurm appliance
 azimuth_caas_stackhpc_slurm_appliance_extra_vars_overrides: {}
 azimuth_caas_stackhpc_slurm_appliance_extra_vars: >-

roles/community_images/defaults/main.yml

@@ -78,10 +78,10 @@ community_images_azimuth_images: |-
 community_images_slurm_base_url: >-
   https://object.arcus.openstack.hpc.cam.ac.uk/swift/v1/AUTH_3a06571936a0424bb40bc5c672c4ccb1/openhpc-images
 community_images_slurm:
-  # from https://github.com/stackhpc/ansible-slurm-appliance/releases/tag/v1.150
+  # from https://github.com/stackhpc/ansible-slurm-appliance/releases/tag/v1.151
   openhpc:
-    name: openhpc-ofed-RL9-240712-1425-6830f97b
-    source_url: "{{ community_images_slurm_base_url }}/openhpc-ofed-RL9-240712-1425-6830f97b"
+    name: openhpc-ofed-RL9-240725-1710-325c7b47
+    source_url: "{{ community_images_slurm_base_url }}/openhpc-ofed-RL9-240725-1710-325c7b47"
     source_disk_format: qcow2
     container_format: bare