From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Fri, 14 Jun 2019 13:27:11 +0000 (+0200)
Subject: dashboard: fix hosts sections in main playbook
X-Git-Tag: v4.0.0rc10~58
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5748215325e92896d5583ce9de731f17f63ca6f8;p=ceph-ansible.git

dashboard: fix hosts sections in main playbook

ceph-dashboard should be deployed on either a dedicated mgr node or a
mon if they are collocated.

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

diff --git a/site-container.yml.sample b/site-container.yml.sample
index 70f339095..27cbdafa8 100644
--- a/site-container.yml.sample
+++ b/site-container.yml.sample
@@ -522,30 +522,30 @@
   become: true
   tasks:
     - block:
-      - import_role:
-          name: ceph-defaults
-        tags: ['ceph_update_config']
-      - import_role:
-          name: ceph-facts
-        tags: ['ceph_update_config']
-      - import_role:
-          name: ceph-handler
-      - import_role:
-          name: ceph-container-engine
-      - import_role:
-          name: ceph-container-common
-      - import_role:
-          name: ceph-node-exporter
-      - import_role:
-          name: ceph-config
-        tags: ['ceph_update_config']
-      - import_role:
-          name: ceph-prometheus
-      - import_role:
-          name: ceph-grafana
+        - import_role:
+            name: ceph-defaults
+          tags: ['ceph_update_config']
+        - import_role:
+            name: ceph-facts
+          tags: ['ceph_update_config']
+        - import_role:
+            name: ceph-handler
+        - import_role:
+            name: ceph-container-engine
+        - import_role:
+            name: ceph-container-common
+        - import_role:
+            name: ceph-node-exporter
+        - import_role:
+            name: ceph-config
+          tags: ['ceph_update_config']
+        - import_role:
+            name: ceph-prometheus
+        - import_role:
+            name: ceph-grafana
       when: dashboard_enabled | bool
 
-- hosts: '{{ groups["grafana-server"][0] | default(groups["mgrs"][0]) | default(groups["mons"][0]) | default(omit) }}'
+- hosts: '{{ groups["mgrs"][0] | default(groups["mons"][0]) | default(omit) }}'
   become: true
   tasks:
     - block:
diff --git a/site.yml.sample b/site.yml.sample
index 9fde7693f..643da98db 100644
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -560,13 +560,13 @@
             name: ceph-grafana
       when: dashboard_enabled | bool
 
-- hosts: '{{ groups["grafana-server"][0] | default(groups["mgrs"][0]) | default(groups["mons"][0]) | default(omit) }}'
+- hosts: '{{ groups["mgrs"][0] | default(groups["mons"][0]) | default(omit) }}'
   become: true
   tasks:
-    - import_role:
-        name: ceph-defaults
-      tags: ['ceph_update_config']
-      when: dashboard_enabled | bool
-    - import_role:
-        name: ceph-dashboard
+    - block:
+        - import_role:
+            name: ceph-defaults
+          tags: ['ceph_update_config']
+        - import_role:
+            name: ceph-dashboard
       when: dashboard_enabled | bool