X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharmed_install.sh;h=550efab45d74ebb62c237c9044f445e8183cc43d;hb=915d985608ca4ff33b1532cd698e2801326c4285;hp=163ed06769c539b385785d5922c1e3448e0cb8a1;hpb=6389247540b9c5668d8dff8cd3845873c95b2db1;p=osm%2Fdevops.git

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index 163ed067..550efab4 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -17,10 +17,10 @@
 
 LXD_VERSION=4.0
 JUJU_VERSION=2.9
-JUJU_AGENT_VERSION=2.9.29
+JUJU_AGENT_VERSION=2.9.42
 K8S_CLOUD_NAME="k8s-cloud"
 KUBECTL="microk8s.kubectl"
-MICROK8S_VERSION=1.23
+MICROK8S_VERSION=1.26
 OSMCLIENT_VERSION=10.0
 IMAGES_OVERLAY_FILE=~/.osm/images-overlay.yaml
 PATH=/snap/bin:${PATH}
@@ -147,7 +147,7 @@ EOF
     else
         sg ${KUBEGRP} -c "echo ${DEFAULT_IP}-${DEFAULT_IP} | microk8s.enable metallb"
         sg ${KUBEGRP} -c "microk8s.enable ingress"
-        sg ${KUBEGRP} -c "microk8s.enable storage dns"
+        sg ${KUBEGRP} -c "microk8s.enable hostpath-storage dns"
         TIME_TO_WAIT=30
         start_time="$(date -u +%s)"
         while true
@@ -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"
 }