Feature 10884: Juju 2.9 support

[osm/devops.git] / installers / full_install_osm.sh

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 0d8d653..817bb7f 100755 (executable)
--- 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=""