Bump Slurm to v2.5, and caas-operator to 0.18.0

roles/azimuth_caas_operator/defaults/main.yml

@@ -97,7 +97,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.160
+azimuth_caas_stackhpc_slurm_appliance_git_version: fix/caas-secrets
 # 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
@@ -119,23 +119,7 @@ azimuth_caas_stackhpc_slurm_appliance_metadata_url: >-
 # The ID of the image to use with the StackHPC Slurm appliance
 # Support the old name for backwards compatibility
 # By default, use the openhpc image from community images if available
-azimuth_caas_stackhpc_slurm_appliance_image: >-
-  {{-
-    azimuth_caas_stackhpc_slurm_appliance_rocky8_image
-    if azimuth_caas_stackhpc_slurm_appliance_rocky8_image is defined
-    else (
-      community_images_image_ids.openhpc
-      if (
-        community_images_image_ids is defined and
-        'openhpc' in community_images_image_ids
-      )
-      else (
-        undef(hint = 'azimuth_caas_stackhpc_slurm_appliance_image is required')
-        if azimuth_caas_stackhpc_slurm_appliance_enabled
-        else None
-      )
-    )
-  }}
+azimuth_caas_stackhpc_slurm_appliance_image: 7ca99016-c342-4557-8a8d-9a856e934b58
 # Combine default and any extra workstation ansible collections
 azimuth_caas_stackhpc_slurm_appliance_init_collections_default: >-
   {{ ansible_init_default_collections | default([]) }}
@@ -196,7 +180,7 @@ azimuth_caas_stackhpc_slurm_appliance_template:
     jobTimeout: "{{ azimuth_caas_stackhpc_slurm_appliance_job_timeout_seconds }}"
     envVars:
       # Normally set through environment's activate script:
-      ANSIBLE_INVENTORY: environments/common/inventory,environments/.caas/inventory # NB: Relative to runner project dir
+      ANSIBLE_INVENTORY: environments/common/inventory,environments/site/inventory,environments/.caas/inventory # NB: Relative to runner project dir
 
 # Indicates if the workstation should be enabled
 azimuth_caas_workstation_enabled: >-