From: Mark Beierl <mark.beierl@canonical.com>
Date: Fri, 29 Jul 2022 19:52:35 +0000 (-0400)
Subject: Correct order for Grafana
X-Git-Tag: v10.1.2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=3e1cef4478b49401c913dc9e2e17ff854cf9fbba;p=osm%2Fdevops.git

Correct order for Grafana

Change-Id: I225cb160149b875982021e8855a2c68f39f218f7
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>
---

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index 163ed067..978a696f 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -286,10 +286,10 @@ function deploy_charmed_osm(){
     juju config -m $MODEL_NAME prometheus site_url=https://prometheus.${API_SERVER}.nip.io
 
     echo "Waiting for deployment to finish..."
+    check_osm_deployed
     grafana_leader=`juju status -m $MODEL_NAME grafana | grep "*" | cut -d "*" -f 1`
     grafana_admin_password=`juju run -m $MODEL_NAME --unit $grafana_leader "echo \\$GF_SECURITY_ADMIN_PASSWORD"`
     juju config -m $MODEL_NAME mon grafana_password=$grafana_admin_password
-    check_osm_deployed
     echo "OSM with charms deployed"
 }