X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharmed_install.sh;h=04a567847481080f88ce8a3025da8cdd80dc40b9;hb=f5051cb9a979b5e5478534f03bab3444fe800b45;hp=e0c3e02a9d0a33c20f660ca29f0d1ef00b510e53;hpb=c395a45423e2f7cce7edae2ab4168d9ec5b51d49;p=osm%2Fdevops.git

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index e0c3e02a..04a56784 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -15,24 +15,32 @@
 
 # set -eux
 
-JUJU_AGENT_VERSION=2.8.9
+JUJU_VERSION=2.9
+JUJU_AGENT_VERSION=2.9.12
 K8S_CLOUD_NAME="k8s-cloud"
 KUBECTL="microk8s.kubectl"
-MICROK8S_VERSION=1.19
-OSMCLIENT_VERSION=9.0
+MICROK8S_VERSION=1.20
+OSMCLIENT_VERSION=10.0
 IMAGES_OVERLAY_FILE=~/.osm/images-overlay.yaml
 PATH=/snap/bin:${PATH}
 
 MODEL_NAME=osm
 
-OSM_BUNDLE=cs:osm-60
-OSM_HA_BUNDLE=cs:osm-ha-45
+# Latest bundles using old mongodb-k8s
+# OSM_BUNDLE=cs:osm-68
+# OSM_HA_BUNDLE=cs:osm-ha-54
+# The charm store does not support referencing charms from CharmHub,
+# therefore we will point to the local bundles until we migrate all
+# 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
 
 function check_arguments(){
     while [ $# -gt 0 ] ; do
         case $1 in
             --bundle) BUNDLE="$2" ;;
+            --overlay) OVERLAY="$2" ;;
             --k8s) KUBECFG="$2" ;;
             --vca) CONTROLLER="$2" ;;
             --lxd) LXD_CLOUD="$2" ;;
@@ -70,7 +78,7 @@ function install_snaps(){
         export KUBECONFIG=${KUBECFG}
         KUBEGRP=$(id -g -n)
     fi
-    sudo snap install juju --classic --channel=2.8/stable
+    sudo snap install juju --classic --channel=$JUJU_VERSION/stable
 }
 
 function bootstrap_k8s_lxd(){
@@ -249,10 +257,14 @@ function deploy_charmed_osm(){
     fi
     [ -v TAG ] && generate_images_overlay && images_overlay="--overlay $IMAGES_OVERLAY_FILE"
 
+    if [ -v OVERLAY ]; then
+        extra_overlay="--overlay $OVERLAY"
+    fi
+
     if [ -v BUNDLE ]; then
-        juju deploy -m $MODEL_NAME $BUNDLE --overlay ~/.osm/vca-overlay.yaml $images_overlay
+        juju deploy -m $MODEL_NAME $BUNDLE --overlay ~/.osm/vca-overlay.yaml $images_overlay $extra_overlay
     else
-        juju deploy -m $MODEL_NAME $OSM_BUNDLE --overlay ~/.osm/vca-overlay.yaml $images_overlay
+        juju deploy -m $MODEL_NAME $OSM_BUNDLE --overlay ~/.osm/vca-overlay.yaml $images_overlay $extra_overlay
     fi
 
     if [ ! -v KUBECFG ]; then
@@ -453,7 +465,7 @@ if [ -v ONLY_VCA ]; then
     hostname=`cat /etc/hostname`
 
     echo "Use the following command to register the installed VCA to your OSM:"
-    echo -e "  osm vca-add --endpoints $vca_host:$vca_port \ \n         --user $vca_user \ \n         --secret $vca_secret \ \n         --cacert $vca_cacert \ \n         --lxd-cloud lxd-cloud \ \n         --lxd-credentials lxd-cloud \ \n         --k8s-cloud microk8s \ \n         --k8s-credentials microk8s\ \n         $hostname-vca"
+    echo -e "  osm vca-add --endpoints $vca_host:$vca_port \\\n         --user $vca_user \\\n         --secret $vca_secret \\\n         --cacert $vca_cacert \\\n         --lxd-cloud lxd-cloud \\\n         --lxd-credentials lxd-cloud \\\n         --k8s-cloud microk8s \\\n         --k8s-credentials microk8s\\\n         $hostname-vca"
 else
     deploy_charmed_osm
     install_osmclient