Skip to content

Commit 3058887

Browse files
committed
Ensure OOD app installs work for site image builds
1 parent e4deac6 commit 3058887

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

environments/common/inventory/group_vars/all/openondemand.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ openondemand_servername: "{{ hostvars[groups['openondemand'].0].ansible_host if
1212

1313
openondemand_auth: basic_pam
1414

15-
openondemand_jupyter_partition: "{{ openhpc_partitions[0]['name'] }}"
16-
openondemand_desktop_partition: "{{ openhpc_partitions[0]['name'] }}"
17-
openondemand_rstudio_partition: "{{ openhpc_partitions[0]['name'] }}"
15+
# Manages case where openhpc_partitions are not defined e.g. for site image builds
16+
openondemand_jupyter_partition: "{{ openhpc_partitions[0].name if (openhpc_partitions | default([])) else '' }}"
17+
openondemand_desktop_partition: "{{ openhpc_partitions[0].name if (openhpc_partitions | default([])) else '' }}"
18+
openondemand_rstudio_partition: "{{ openhpc_partitions[0].name if (openhpc_partitions | default([])) else '' }}"
1819
openondemand_matlab_partition: '' # Requires target site to already have MATLAB so set to empty
19-
openondemand_codeserver_partition: "{{ openhpc_partitions[0]['name'] }}"
20+
openondemand_codeserver_partition: "{{ openhpc_partitions[0].name if (openhpc_partitions | default([])) else '' }}"
2021

2122
# Regex defining hosts which openondemand can proxy; the default regex is compute nodes (for apps) and grafana host,
2223
# e.g. if the group `compute` has hosts `compute-{0,1,2,..}` this will be '(compute-\d+)|(control)'.

environments/common/inventory/group_vars/builder/defaults.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,9 @@ sssd_enabled: false
2727
slurm_exporter_state: stopped
2828
appliances_mode: build
2929
proxy_remove: true
30+
# for image build ood partition var is just truthy as no cluster_groups defined
31+
openondemand_jupyter_partition: true
32+
openondemand_desktop_partition: true
33+
openondemand_rstudio_partition: false
34+
openondemand_matlab_partition: false
35+
openondemand_codeserver_partition: false

0 commit comments

Comments
 (0)