From 909c27363334918acab59c1320ca1dc41aeb61fe Mon Sep 17 00:00:00 2001 From: Mark Beierl Date: Fri, 29 Jul 2022 15:52:35 -0400 Subject: [PATCH 1/1] Correct order for Grafana Change-Id: I225cb160149b875982021e8855a2c68f39f218f7 Signed-off-by: Mark Beierl --- installers/charmed_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" } -- 2.25.1