X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharmed_install.sh;h=9172ac3409ca5918dd3619636400d61dec1c7639;hb=87feb6d8f0b1f16ff9e2bc693df2269bb562d9c6;hp=eafbddd5481287d6870df35d68a3b9c438a1b10b;hpb=32b38a0d121a70a53446c3c8ed017986b223bec3;p=osm%2Fdevops.git diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh index eafbddd5..9172ac34 100755 --- a/installers/charmed_install.sh +++ b/installers/charmed_install.sh @@ -20,7 +20,7 @@ JUJU_VERSION=2.9 JUJU_AGENT_VERSION=2.9.34 K8S_CLOUD_NAME="k8s-cloud" KUBECTL="microk8s.kubectl" -MICROK8S_VERSION=1.23 +MICROK8S_VERSION=1.26 OSMCLIENT_VERSION=latest IMAGES_OVERLAY_FILE=~/.osm/images-overlay.yaml PASSWORD_OVERLAY_FILE=~/.osm/password-overlay.yaml @@ -44,7 +44,7 @@ MODEL_NAME=osm OSM_BUNDLE=ch:osm OSM_HA_BUNDLE=ch:osm-ha -CHARMHUB_CHANNEL=latest/beta +CHARMHUB_CHANNEL=latest/edge/paas unset TAG function check_arguments(){ @@ -137,7 +137,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 @@ -314,7 +314,7 @@ function deploy_charmed_osm(){ function check_osm_deployed() { TIME_TO_WAIT=600 start_time="$(date -u +%s)" - total_service_count=15 + total_service_count=16 [ -n "$INSTALL_PLA" ] && total_service_count=$((total_service_count + 1)) previous_count=0 while true