Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions roles/azimuth_caas_operator/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: v2.5
# 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
Expand Down Expand Up @@ -196,7 +196,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: >-
Expand Down
8 changes: 4 additions & 4 deletions roles/community_images/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@ community_images_azimuth_images: |-

# 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
https://leafcloud.store/swift/v1/AUTH_f39848421b2747148400ad8eeae8d536/openhpc-images
community_images_slurm:
# from https://github.com/stackhpc/ansible-slurm-appliance/releases/tag/v1.159
# from https://github.com/stackhpc/ansible-slurm-appliance/releases/tag/v2.5
openhpc:
name: openhpc-RL9-250506-1259-abb6394b
source_url: "{{ community_images_slurm_base_url }}/openhpc-RL9-250506-1259-abb6394b"
name: openhpc-RL9-250908-2047-d90ebd0e
source_url: "{{ community_images_slurm_base_url }}/openhpc-RL9-250908-2047-d90ebd0e"
source_disk_format: qcow2
container_format: bare

Expand Down
Loading