From: beierlm <mark.beierl@canonical.com>
Date: Tue, 15 Sep 2020 20:00:34 +0000 (-0400)
Subject: Pin Juju Version
X-Git-Tag: release-v9.0-start~64
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=2634cd3ab6e8737d4e1e35aa02bdab9d0c51bd9b;p=osm%2Fdevops.git

Pin Juju Version
Pins the agent version of juju to ensure consistent
behaviour.

Change-Id: I7112638fd02bc9ab9e6be5aa18481f93dd955f3a
Signed-off-by: beierlm <mark.beierl@canonical.com>
---

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index 89b85cc8..45a38c1a 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -74,7 +74,9 @@ EOF
 
     if [ -v KUBECFG ]; then
         cat $KUBECFG | juju add-k8s $K8S_CLOUD_NAME $ADD_K8S_OPTS
-        [ -v BOOTSTRAP_NEEDED ] && juju bootstrap $K8S_CLOUD_NAME $CONTROLLER_NAME --config controller-service-type=loadbalancer
+        [ -v BOOTSTRAP_NEEDED ] && juju bootstrap $K8S_CLOUD_NAME $CONTROLLER_NAME \
+            --config controller-service-type=loadbalancer \
+            --agent-version=2.8.1
     else
         sg ${KUBEGRP} -c "echo ${DEFAULT_IP}-${DEFAULT_IP} | microk8s.enable metallb"
         sg ${KUBEGRP} -c "microk8s.enable storage dns"
@@ -96,7 +98,9 @@ EOF
         done
 
         [ ! -v BOOTSTRAP_NEEDED ] && sg ${KUBEGRP} -c "microk8s.config" | juju add-k8s $K8S_CLOUD_NAME $ADD_K8S_OPTS
-        [ -v BOOTSTRAP_NEEDED ] && sg ${KUBEGRP} -c "juju bootstrap microk8s $CONTROLLER_NAME --config controller-service-type=loadbalancer" && K8S_CLOUD_NAME=microk8s
+        [ -v BOOTSTRAP_NEEDED ] && sg ${KUBEGRP} -c \
+            "juju bootstrap microk8s $CONTROLLER_NAME --config controller-service-type=loadbalancer --agent-version=2.8.1" \
+            && K8S_CLOUD_NAME=microk8s
     fi
 
     if [ -v LXD_CLOUD ]; then
diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 9d1fca1f..6ced1a32 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -427,7 +427,7 @@ function juju_createcontroller() {
     if ! juju show-controller $OSM_STACK_NAME &> /dev/null; then
         # Not found created, create the controller
         sudo usermod -a -G lxd ${USER}
-        sg lxd -c "juju bootstrap --bootstrap-series=xenial $OSM_VCA_CLOUDNAME $OSM_STACK_NAME"
+        sg lxd -c "juju bootstrap --bootstrap-series=xenial --agent-version=2.8.1 $OSM_VCA_CLOUDNAME $OSM_STACK_NAME"
     fi
     [ $(juju controllers | awk "/^${OSM_STACK_NAME}[\*| ]/{print $1}"|wc -l) -eq 1 ] || FATAL "Juju installation failed"
     juju controller-config features=[k8s-operators]