simplify fixing appliances_repository_root for CaaS

Author: sjpb

group_vars/cluster.yml

@@ -1,3 +1,7 @@
+# Account for the fact we are running outside of the expected environment system:
+# NB: this only works for playbooks in ansible/*, not in ansible/adhoc!
+appliances_repository_root: "{{ playbook_dir }}/../"
+
 # Convert the variable supplied by the portal into the one expected by the Slurm appliance
 update_enable: "{{ cluster_upgrade_system_packages | default('false') | bool }}"
 # The update logs are written on the Ansible controller

group_vars/filebeat.yml

@@ -6,7 +6,3 @@ openondemand_address: "{{ hostvars[groups['openondemand'].0].api_address if 'ope
 # 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 [] ) }}"
-
-# Modify to account for the fact we are running outside of the expected environment system
-prometheus_alert_rules_files:
-- "{{ playbook_dir }}/../environments/common/files/prometheus/rules/*.rules"