tidy OOD regex filter

Author: sjpb

ansible/filter_plugins/utils.py

@@ -35,14 +35,14 @@ def readfile(fpath):
 def exists(fpath):
     return os.path.isfile(fpath)
 
-def to_regex(items):
+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
-    # ave to do replacement in two stages:
+    # 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]
@@ -62,5 +62,5 @@ def filters(self):
             'prometheus_node_exporter_targets': prometheus_node_exporter_targets,
             'exists': exists,
             'warn': self.warn,
-            'to_regex': to_regex
+            'to_ood_regex': to_ood_regex,
         }

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

@@ -10,7 +10,7 @@
 # regex defining hosts which openondemand can proxy; the default regex is compute nodes (for apps) and grafana host.
 # the autogenerated regex may need overriding if compute nodes names do not contain numbers in a consistent position or
 # or include regex special characters.
-openondemand_host_regex: "{{ (groups['compute'] + groups['grafana']) | to_regex }}"
+openondemand_host_regex: "{{ (groups['compute'] + groups['grafana']) | to_ood_regex }}"
 
 ondemand_package: ondemand-2.0.29