X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Ffull_install_osm.sh;h=817bb7fc67cb74aabcf7b14a8f2f2b8eb2278be8;hb=d68e0b4f0bc482d61f2e2a775b899237e15f93e9;hp=0d8d6537720255fb3d2fc4e0d7023527045f64d9;hpb=20611225b7c1283bc5ce1572b5515e898c6df2b5;p=osm%2Fdevops.git diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index 0d8d6537..817bb7fc 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -446,7 +446,7 @@ function install_docker_compose() { function install_juju() { echo "Installing juju" - sudo snap install juju --classic --channel=2.8/stable + sudo snap install juju --classic --channel=$JUJU_VERSION/stable [[ ":$PATH": != *":/snap/bin:"* ]] && PATH="/snap/bin:${PATH}" [ -n "$INSTALL_NOCACHELXDIMAGES" ] || update_juju_images echo "Finished installation of juju" @@ -901,13 +901,7 @@ function deploy_osm_services() { #deploy charmed services function deploy_charmed_services() { juju add-model $OSM_STACK_NAME $OSM_VCA_K8S_CLOUDNAME - # deploy mongodb charm - namespace=$OSM_STACK_NAME - juju deploy cs:~charmed-osm/mongodb-k8s \ - --config enable-sidecar=true \ - --config replica-set=rs0 \ - --config namespace=$namespace \ - -m $namespace + juju deploy ch:mongodb-k8s -m $OSM_STACK_NAME } function deploy_osm_pla_service() { @@ -1548,7 +1542,8 @@ function parse_docker_registry_url() { DOCKER_REGISTRY_URL=$(echo "$DOCKER_REGISTRY_URL" | awk '{split($1,a,"@"); print a[2]}') } -JUJU_AGENT_VERSION=2.8.6 +JUJU_VERSION=2.9 +JUJU_AGENT_VERSION=2.9.5 UNINSTALL="" DEVELOP="" UPDATE=""