X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharmed_install.sh;h=3ef2f5fb623baab67b25671d9a0a9d3ea5b8b84c;hb=72ac65cee3fd3307338c96036f5c0ed06daa3617;hp=f1dd29a1d8d426919dadc470017df4e03ac1d884;hpb=0db6e9f7c9f05675525ac0c06b4f2db63a3f23bb;p=osm%2Fdevops.git diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh index f1dd29a1..3ef2f5fb 100755 --- a/installers/charmed_install.sh +++ b/installers/charmed_install.sh @@ -17,7 +17,7 @@ LXD_VERSION=4.0 JUJU_VERSION=2.9 -JUJU_AGENT_VERSION=2.9.9 +JUJU_AGENT_VERSION=2.9.17 K8S_CLOUD_NAME="k8s-cloud" KUBECTL="microk8s.kubectl" MICROK8S_VERSION=1.20 @@ -35,7 +35,7 @@ MODEL_NAME=osm # charms to CharmHub. OSM_BUNDLE=/usr/share/osm-devops/installers/charm/bundles/osm/bundle.yaml OSM_HA_BUNDLE=/usr/share/osm-devops/installers/charm/bundles/osm-ha/bundle.yaml -TAG=testing-daily +TAG=11 function check_arguments(){ while [ $# -gt 0 ] ; do @@ -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" }