playbooks: show cluster status after dashboard

We should show the ceph cluster status as the last task of the playbook.

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

diff --git a/site-container.yml.sample b/site-container.yml.sample
index 301ecf83af6ee974971f5dadb0b97443d589bddf..e43ade091d4de50c9fe881ebc8007dc2d41809d8 100644 (file)
--- a/site-container.yml.sample
+++ b/site-container.yml.sample
@@ -410,6 +410,11 @@
             status: "Complete"
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
+- import_playbook: dashboard.yml
+  when:
+    - dashboard_enabled | bool
+    - groups.get(grafana_server_group_name, []) | length > 0
+
 - hosts: mons
   gather_facts: false
   become: True
@@ -441,8 +446,3 @@
       delegate_to: "{{ groups[mon_group_name][0] }}"
       run_once: true
       when: not ceph_status.failed
-
-- import_playbook: dashboard.yml
-  when:
-    - dashboard_enabled | bool
-    - groups.get(grafana_server_group_name, []) | length > 0

diff --git a/site.yml.sample b/site.yml.sample
index cd2847cf8a1f338021958110d548a440b07f45b5..ea5fbfd6e6be8e06ad9b12feaee0674c7b4d4ea1 100644 (file)
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -435,6 +435,11 @@
             status: "Complete"
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
+- import_playbook: dashboard.yml
+  when:
+    - dashboard_enabled | bool
+    - groups.get(grafana_server_group_name, []) | length > 0
+
 - hosts: mons
   gather_facts: false
   become: True
@@ -455,8 +460,3 @@
       delegate_to: "{{ groups[mon_group_name][0] }}"
       run_once: true
       when: not ceph_status.failed
-
-- import_playbook: dashboard.yml
-  when:
-    - dashboard_enabled | bool
-    - groups.get(grafana_server_group_name, []) | length > 0