From: David Garcia <david.garcia@canonical.com>
Date: Thu, 9 Sep 2021 15:23:42 +0000 (+0200)
Subject: Pin LXD version to 4.17
X-Git-Tag: v10.0.2~2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=d9c90a0c8e2415f614a1d022e28e732fa29447e1;p=osm%2Fdevops.git

Pin LXD version to 4.17

Change-Id: Ibcbbffd7be34462e4fb0521458ca739f1d0aa150
Signed-off-by: David Garcia <david.garcia@canonical.com>
---

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index c35a5b39..3703ca60 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -15,6 +15,8 @@
 
 # set -eux
 
+LXD_VERSION=4.17
+JUJU_VERSION=2.8
 JUJU_AGENT_VERSION=2.8.9
 K8S_CLOUD_NAME="k8s-cloud"
 KUBECTL="microk8s.kubectl"
@@ -71,7 +73,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(){
@@ -151,7 +153,7 @@ EOF
         sudo sysctl --system
         # Install LXD snap
         sudo apt-get remove --purge -y liblxc1 lxc-common lxcfs lxd lxd-client
-        sudo snap install lxd
+        sudo snap install lxd --channel $LXD_VERSION/stable
         # Configure LXD
         sudo usermod -a -G lxd `whoami`
         cat /usr/share/osm-devops/installers/lxd-preseed.conf | sed 's/^config: {}/config:\n  core.https_address: '$LXDENDPOINT':8443/' | sg lxd -c "lxd init --preseed"
diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index cba4fdab..5ceb649f 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -290,7 +290,7 @@ function install_lxd() {
 
     # Install LXD snap
     sudo apt-get remove --purge -y liblxc1 lxc-common lxcfs lxd lxd-client
-    sudo snap install lxd
+    sudo snap install lxd --channel $LXD_VERSION/stable
 
     # Configure LXD
     sudo usermod -a -G lxd `whoami`
@@ -444,7 +444,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"
@@ -1527,6 +1527,8 @@ function parse_docker_registry_url() {
     DOCKER_REGISTRY_URL=$(echo "$DOCKER_REGISTRY_URL" | awk '{split($1,a,"@"); print a[2]}')
 }
 
+LXD_VERSION=4.17
+JUJU_VERSION=2.8
 JUJU_AGENT_VERSION=2.8.6
 UNINSTALL=""
 DEVELOP=""