X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharmed_install.sh;h=bd714a6a754a0573f5a35a5cec80058b0a2c2ffa;hb=refs%2Fchanges%2F85%2F11485%2F4;hp=577fe82ce7f731a156c2b5c986112b73f9de90c5;hpb=413bc263cea11a166bf38d11259e153f521dd500;p=osm%2Fdevops.git

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index 577fe82c..bd714a6a 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -286,6 +286,10 @@ function deploy_charmed_osm(){
 
     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"
 }
 
@@ -446,8 +450,8 @@ function install_microstack() {
     version: 3}'
 }
 
-DEFAULT_IF=`ip route list match 0.0.0.0 | awk '{print $5}'`
-DEFAULT_IP=`ip -o -4 a |grep ${DEFAULT_IF}|awk '{split($4,a,"/"); print a[1]}'`
+DEFAULT_IF=`ip route list match 0.0.0.0 | awk '{print $5; exit}'`
+DEFAULT_IP=`ip -o -4 a |grep ${DEFAULT_IF}|awk '{split($4,a,"/"); print a[1]; exit}'`
 
 check_arguments $@
 mkdir -p ~/.osm