From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Wed, 4 Dec 2019 16:17:36 +0000 (+0100)
Subject: upgrade: add dashboard deployment
X-Git-Tag: v6.0.0alpha1~183
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=451c5ca93499fc0520b60729a170f0aa6f6132db;p=ceph-ansible.git

upgrade: add dashboard deployment

when upgrading from RHCS 3, dashboard has obviously never been deployed
and it forces us to deploy it later manually.
This commit adds the dashboard deployment as part of the upgrade to
RHCS 4.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1779092

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---

diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml
index 645c04052..65e177ce8 100644
--- a/infrastructure-playbooks/rolling_update.yml
+++ b/infrastructure-playbooks/rolling_update.yml
@@ -49,6 +49,7 @@
     - "{{ nfs_group_name|default('nfss') }}"
     - "{{ client_group_name|default('clients') }}"
     - "{{ iscsi_gw_group_name|default('iscsigws') }}"
+    - "{{ grafana_server_group_name|default('grafana-server') }}"
 
   become: True
   gather_facts: False
@@ -72,6 +73,15 @@
       run_once: true
       when: delegate_facts_host | bool
 
+    - import_role:
+        name: ceph-facts
+
+    - import_role:
+        name: ceph-infra
+
+    - import_role:
+        name: ceph-validate
+
     - set_fact: rolling_update=true
 
 - name: upgrade ceph mon cluster
@@ -961,6 +971,10 @@
       vars:
         msgr2_migration: True
 
+- import_playbook: ../dashboard.yml
+  when:
+    - dashboard_enabled | bool
+    - groups.get(grafana_server_group_name, []) | length > 0
 
 - name: show ceph status
   hosts: "{{ mon_group_name|default('mons') }}"