fix slurm_exporter for offline site playbook

Author: sjpb

ansible/fatimage.yml

@@ -171,11 +171,9 @@
       when: "'openondemand' in group_names"
 
     - name: slurm exporter
-      import_role:
+      include_role:
         name: slurm_exporter
-        tasks_from: install
-      vars:
-        slurm_exporter_state: stopped
+        tasks_from: install.yml
       when: "'slurm_exporter' in group_names"
 
     - name: Install alertmanager

ansible/monitoring.yml

@@ -54,8 +54,10 @@
   tags: slurm_exporter
   environment: "{{ appliances_environment_vars }}"
   tasks:
-    - import_role:
+    - include_role:
         name: slurm_exporter
+        tasks_from: "{{ 'configure.yml' if appliances_mode == 'configure' else 'main.yml' }}"
+
 
 - name: Setup core monitoring software
   hosts: prometheus

ansible/roles/slurm_exporter/tasks/configure.yml

@@ -0,0 +1,7 @@
+- name: Ensure slurm exporter state
+  systemd:
+    name: prometheus-slurm-exporter
+    state: "{{ slurm_exporter_state }}"
+    enabled: true
+  when:
+    - not ansible_check_mode

ansible/roles/slurm_exporter/tasks/install.yml

@@ -6,10 +6,3 @@
 
 - meta: flush_handlers
 
-- name: Ensure slurm exporter state
-  systemd:
-    name: prometheus-slurm-exporter
-    state: "{{ slurm_exporter_state }}"
-    enabled: true
-  when:
-    - not ansible_check_mode

ansible/roles/slurm_exporter/tasks/main.yml

@@ -1,2 +1,3 @@
 ---
 - import_tasks: install.yml
+- import_tasks: configure.yml

environments/common/inventory/group_vars/builder/defaults.yml

@@ -24,4 +24,5 @@ tuned_started: false
 tuned_enabled: false
 sssd_started: false
 sssd_enabled: false
+slurm_exporter_state: stopped
 appliances_mode: build