From: beierlm <mark.beierl@canonical.com>
Date: Wed, 30 Sep 2020 10:03:45 +0000 (-0400)
Subject: Revert Juju Version
X-Git-Tag: v8.0.2~1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F66%2F9766%2F1;p=osm%2Fdevops.git

Revert Juju Version

Pins the Juju agent version to 2.8.1 as the model cleanup can
timeout, but this does not happen in master where the version
is 2.8.1

Bug 1216

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

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index bed7a146..86ac0c29 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -77,7 +77,7 @@ EOF
         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 \
-            --agent-version=2.8.3
+            --agent-version=2.8.1
     else
         sg ${KUBEGRP} -c "echo ${DEFAULT_IP}-${DEFAULT_IP} | microk8s.enable metallb"
         sg ${KUBEGRP} -c "microk8s.enable storage dns"
diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index c6499cd3..2c0aa5c6 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -416,7 +416,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 --agent-version=2.8.3 $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]