From a80cfd0e9541c2b59e9ce5e2558c8ca5b33a558c Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Fri, 15 Dec 2023 11:22:27 +0000 Subject: [PATCH] provide usable defaults for OOD --- .../inventory/group_vars/all/openondemand.yml | 3 --- .../inventory/group_vars/all/openondemand.yml | 1 - .../group_vars/openondemand/overrides.yml | 6 ------ .../inventory/group_vars/all/openondemand.yml | 17 ++++++++++++----- 4 files changed, 12 insertions(+), 15 deletions(-) delete mode 100644 environments/.stackhpc/inventory/group_vars/all/openondemand.yml delete mode 100644 environments/.stackhpc/inventory/group_vars/openondemand/overrides.yml diff --git a/environments/.caas/inventory/group_vars/all/openondemand.yml b/environments/.caas/inventory/group_vars/all/openondemand.yml index 60461bd61..61d4afd5a 100644 --- a/environments/.caas/inventory/group_vars/all/openondemand.yml +++ b/environments/.caas/inventory/group_vars/all/openondemand.yml @@ -1,7 +1,4 @@ --- -openondemand_auth: basic_pam -openondemand_jupyter_partition: "{{ openhpc_slurm_partitions[0]['name'] }}" -openondemand_desktop_partition: "{{ openhpc_slurm_partitions[0]['name'] }}" httpd_listen_addr_port: - 80 diff --git a/environments/.stackhpc/inventory/group_vars/all/openondemand.yml b/environments/.stackhpc/inventory/group_vars/all/openondemand.yml deleted file mode 100644 index 11d475664..000000000 --- a/environments/.stackhpc/inventory/group_vars/all/openondemand.yml +++ /dev/null @@ -1 +0,0 @@ -openondemand_servername: "{{ hostvars[ groups['openondemand'] | first].ansible_host }}" # Use a SOCKS proxy to acccess diff --git a/environments/.stackhpc/inventory/group_vars/openondemand/overrides.yml b/environments/.stackhpc/inventory/group_vars/openondemand/overrides.yml deleted file mode 100644 index f810b7ecc..000000000 --- a/environments/.stackhpc/inventory/group_vars/openondemand/overrides.yml +++ /dev/null @@ -1,6 +0,0 @@ -openondemand_auth: basic_pam -openondemand_jupyter_partition: small -openondemand_desktop_partition: small -#openondemand_dashboard_support_url: -#openondemand_dashboard_docs_url: -#openondemand_filesapp_paths: diff --git a/environments/common/inventory/group_vars/all/openondemand.yml b/environments/common/inventory/group_vars/all/openondemand.yml index b7bdfdabc..b30ddb1e6 100644 --- a/environments/common/inventory/group_vars/all/openondemand.yml +++ b/environments/common/inventory/group_vars/all/openondemand.yml @@ -1,11 +1,20 @@ --- -# See: ansible/roles/openondemand/README.md -# for variable definitions. +# Defaults for Open Ondemand configuration. +# See ansible/roles/openondemand/README.md for all definitions. # NB: Variables prefixed ood_ are all from https://github.com/OSC/ood-ansible -# openondemand_servername: '' # Must be defined when using openondemand +# --- Variables likely to need environment-specific overrides --- +openondemand_servername: "{{ hostvars[ groups['openondemand'] | first].ansible_host }}" +# This assumes access via a SOCKS proxy. If not, set to external address - see full description in ansible/roles/openondemand/README.md +openondemand_auth: basic_pam +openondemand_jupyter_partition: "{{ openhpc_slurm_partitions[0]['name'] }}" +openondemand_desktop_partition: "{{ openhpc_slurm_partitions[0]['name'] }}" +openondemand_dashboard_support_url: '' +openondemand_dashboard_docs_url: '' +openondemand_filesapp_paths: [] +# --- end -- # Regex defining hosts which openondemand can proxy; the default regex is compute nodes (for apps) and grafana host, # e.g. if the group `compute` has hosts `compute-{0,1,2,..}` this will be '(compute-\d+)|(control)'. @@ -149,8 +158,6 @@ openondemand_apps_jupyter_default: openondemand_apps_jupyter: "{{ {'jupyter':openondemand_apps_jupyter_default} if openondemand_jupyter_partition | default(none) else {} }}" # osc.ood:ood_apps - see https://github.com/OSC/ood-ansible#ood_apps -openondemand_dashboard_support_url: '' -openondemand_dashboard_docs_url: '' openondemand_apps: files: env: