From: Adam Israel <adam.israel@canonical.com>
Date: Fri, 9 Aug 2019 13:24:53 +0000 (-0400)
Subject: Fix bug 816
X-Git-Tag: v7.0.0rc1~74
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=34f8b6bc66d0b98b38f33aaeb07d0c8b53e04007;p=osm%2Fdevops.git

Fix bug 816

This pins the installed version of Juju to 2.5, which matches the pinned
version of libjuju used by N2VC. The mismatch is causing issues
deploying charms with new installs.

Change-Id: Ia831b7735511172a64e6e691ce87848dc5b95ae4
Signed-off-by: Adam Israel <adam.israel@canonical.com>
---

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index ffeb9605..167ca87b 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -630,7 +630,7 @@ function install_docker_compose() {
 
 function install_juju() {
     echo "Installing juju"
-    sudo snap install juju --classic
+    sudo snap install juju --classic --channel=2.5/stable
     [ -z "$INSTALL_NOLXD" ] && sudo dpkg-reconfigure -p medium lxd
     echo "Finished installation of juju"
     return 0