From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Wed, 22 May 2019 14:12:16 +0000 (+0200)
Subject: dashboard: append mgr modules to ceph_mgr_modules
X-Git-Tag: v4.0.0rc10~34
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=28e1ce0d8ca034ba8041936dbd2b1d4ce749d948;p=ceph-ansible.git

dashboard: append mgr modules to ceph_mgr_modules

when `dashboard_enabled` is `True`, let's append `dashboard` and
`prometheus` modules to `ceph_mgr_modules` so they are automatically
loaded.

Closes: #4026

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit a2b6f446652b6f043a81f68417fd832996c75b54)
---

diff --git a/roles/ceph-mgr/tasks/mgr_modules.yml b/roles/ceph-mgr/tasks/mgr_modules.yml
index 2e6eac9c5..320e85467 100644
--- a/roles/ceph-mgr/tasks/mgr_modules.yml
+++ b/roles/ceph-mgr/tasks/mgr_modules.yml
@@ -1,4 +1,9 @@
 ---
+- name: append dashboard modules to ceph_mgr_modules
+  set_fact:
+    ceph_mgr_modules: "{{ (ceph_mgr_modules + [ 'dashboard', 'prometheus' ]) | unique }}"
+  when: dashboard_enabled | bool
+
 - name: wait for all mgr to be up
   shell: "{{ container_exec_cmd | default('') }} ceph --cluster {{ cluster }} mgr dump -f json | python -c 'import sys, json; print(json.load(sys.stdin)[\"available\"])'"
   register: mgr_dump