Merge branch 'main' into fix/ansible-user

Author: sjpb

ansible/filter_plugins/utils.py

@@ -9,6 +9,7 @@
 import jinja2
 from ansible.module_utils.six import string_types
 import os.path
+import re
 
 def prometheus_node_exporter_targets(hosts, env):
     result = []
@@ -34,6 +35,19 @@ def readfile(fpath):
 def exists(fpath):
     return os.path.isfile(fpath)
 
+def to_ood_regex(items):
+    """ Convert a list of strings possibly containing digits into a regex containing \d+
+    
+        eg {{ [compute-001, compute-002, control] | to_regex }} -> '(compute-\d+)|(control)'
+    """
+    
+    # There's a python bug which means re.sub() can't use '\d' in the replacement so
+    # have to do replacement in two stages:
+    r = [re.sub(r"\d+", 'XBACKSLASHX', v) for v in items]
+    r = [v.replace('XBACKSLASHX', '\d+') for v in set(r)]
+    r = ['(%s)' % v for v in r]
+    return '|'.join(r)
+
 class FilterModule(object):
     ''' Ansible core jinja2 filters '''
 
@@ -47,5 +61,6 @@ def filters(self):
             'readfile': readfile,
             'prometheus_node_exporter_targets': prometheus_node_exporter_targets,
             'exists': exists,
-            'warn': self.warn
+            'warn': self.warn,
+            'to_ood_regex': to_ood_regex,
         }

environments/arcus/inventory/group_vars/openondemand/overrides.yml

@@ -1,5 +1,4 @@
 openondemand_auth: basic_pam
-openondemand_host_regex: '({{ openhpc_cluster_name }}-compute-\d+)|({{ groups["grafana"] | first }})' # allows proxying to compute nodes for apps and control for monitoring
 openondemand_jupyter_partition: small
 openondemand_desktop_partition: small
 #openondemand_dashboard_support_url: 

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

@@ -7,6 +7,12 @@
 
 # openondemand_servername: '' # Must be defined when using openondemand
 
+# 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)'.
+# The autogenerated regex may need overriding if compute node names do not contain numbers in a consistent position 
+# or include regex special characters.
+openondemand_host_regex: "{{ (groups['compute'] + groups['grafana']) | to_ood_regex }}"
+
 ondemand_package: ondemand-2.0.29
 
 openondemand_dashboard_links: # TODO: should really only be deployed if grafana is deployed and proxying configured