converge caas prom config

Author: sjpb

environments/.caas/inventory/group_vars/all/prometheus.yml

@@ -1,11 +1,4 @@
 ---
-# Override openondemand_address because its needed in openondemand_scrape_configs
-# which is used in prometheus_scrape_configs
-openondemand_address: "{{ hostvars[groups['openondemand'].0].api_address if 'openondemand' in groups else '' }}"
-
-# Override group_var set in ansible-slurm-appliance all group - unless
-# OOD is being deployed then there won't be an OOD group
-prometheus_scrape_configs: "{{ prometheus_scrape_configs_default + (openondemand_scrape_configs if ( 'openondemand' in groups ) else [] ) }}"
 
 # Set Prometheus storage retention size
-prometheus_storage_retention_size: "{{ metrics_db_maximum_size }}GB"
+prometheus_storage_retention_size: "{{ metrics_db_maximum_size }}GB"