From: Dimitri Savineau <dsavinea@redhat.com>
Date: Fri, 2 Aug 2019 15:24:03 +0000 (-0400)
Subject: dashboard: run dashboard role on mgr/mon nodes
X-Git-Tag: v4.0.0rc14~34
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f9d9ffac8fa9c771743f695e291b35b84481e475;p=ceph-ansible.git

dashboard: run dashboard role on mgr/mon nodes

We don't need to execute the ceph-dashboard role on the nodes present
in the grafana-server group. This one is dedicated to the grafana and
prometheus stack.
The ceph-dashboard needs to executed where the ceph-mgr is running. It
is either on the dedicated mgr nodes or if mgr and mon are collocated
implicitly on the mon nodes.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 16939eff9efc680aebaafa12f2a25a804400b5e9)
---

diff --git a/infrastructure-playbooks/dashboard.yml b/infrastructure-playbooks/dashboard.yml
index dd6c48d6c..1ad10a856 100644
--- a/infrastructure-playbooks/dashboard.yml
+++ b/infrastructure-playbooks/dashboard.yml
@@ -67,7 +67,7 @@
             status: "Complete"
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
-- hosts: "{{ grafana_server_group_name }}"
+- hosts: "{{ groups[mgr_group_name] | default(groups[mon_group_name]) }}"
   become: true
   pre_tasks:
     - name: set ceph dashboard install 'In Progress'