X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharmed_install.sh;h=bb1a9da6976f4bc8d1de55af85ab72f78725b80e;hb=refs%2Fchanges%2F15%2F11415%2F1;hp=abbd2afa0674925c97f76da526a3a76e4d311b7f;hpb=847febf8619c2d3a3a66afef14fe794fdf02d8d5;p=osm%2Fdevops.git diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh index abbd2afa..bb1a9da6 100755 --- a/installers/charmed_install.sh +++ b/installers/charmed_install.sh @@ -21,7 +21,7 @@ JUJU_AGENT_VERSION=2.9.17 K8S_CLOUD_NAME="k8s-cloud" KUBECTL="microk8s.kubectl" MICROK8S_VERSION=1.20 -OSMCLIENT_VERSION=10.0 +OSMCLIENT_VERSION=11.0 IMAGES_OVERLAY_FILE=~/.osm/images-overlay.yaml PATH=/snap/bin:${PATH} @@ -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" }