backup do-not-merge changes

Author: sjpb

environments/.stackhpc/inventory/extra_groups

@@ -38,12 +38,6 @@ cluster
 # Install squid into fat image
 builder
 
-[squid]
-# DO NOT MERGE:
-# configure squid on deploy host (steveb-dev) using stackhpc-dev network
-localhost ansible_host=10.20.0.121 ansible_connection=local
-# Note you could add any other connection vars e.g. ansible_user you need here
-
 [sssd:children]
 # Install sssd into fat image
 builder
@@ -56,8 +50,3 @@ cluster
 
 [compute_init:children]
 compute
-
-# DO NOT MERGE:
-# turn on proxying for the cluster
-[proxy:children]
-cluster

environments/.stackhpc/inventory/group_vars/all/proxy.yml

@@ -22,14 +22,13 @@ grafana_serve_from_sub_path: "{{ groups['openondemand'] | count > 0 }}"
 
 grafana_dashboards_default:
   # node exporter slurm:
-  # DO NOT MERGE:
-  # - dashboard_id: 13427
-  #   replacements:
-  #     - placeholder: DS_PROMETHEUS
-  #       replacement: prometheus
-  #     - placeholder: DS_ELASTICSEARCH
-  #       replacement: slurmstats
-  #   revision_id: 1
+  - dashboard_id: 13427
+    replacements:
+      - placeholder: DS_PROMETHEUS
+        replacement: prometheus
+      - placeholder: DS_ELASTICSEARCH
+        replacement: slurmstats
+    revision_id: 1
   # openhpc slurm:
   - dashboard_file: openhpc-slurm.json
     replacements:
@@ -45,12 +44,11 @@ grafana_dashboards_default:
       - placeholder: DS_SLURMSTATS
         replacement: slurmstats
   # slurm exporter
-  # DO NOT MERGE:
-  # - dashboard_id: 4323
-  #   replacements:
-  #     - placeholder: DS_PROMETHEUS
-  #       replacement: prometheus
-  #   revision_id: 3
+  - dashboard_id: 4323
+    replacements:
+      - placeholder: DS_PROMETHEUS
+        replacement: prometheus
+    revision_id: 3
 
 grafana_dashboards: "{{ grafana_dashboards_default + (openondemand_dashboard if groups.get('openondemand') else []) }}"