X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fdevops.git;a=blobdiff_plain;f=installers%2Fcharmed_install.sh;h=4c5c18f0514a772e87649912cd966f58acb5bc7a;hp=c2b678b9a54d2aa0eac189fa62f96c004e3ec5c5;hb=aac52e0ac6d5364e48d2c25b00d6a1435b7e0d6a;hpb=77e764e28f59f40195c18009eb86ec46f37a4235 diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh index c2b678b9..4c5c18f0 100755 --- a/installers/charmed_install.sh +++ b/installers/charmed_install.sh @@ -15,7 +15,9 @@ # set -eux -JUJU_AGENT_VERSION=2.8.8 +LXD_VERSION=4.0 +JUJU_VERSION=2.8 +JUJU_AGENT_VERSION=2.8.11 K8S_CLOUD_NAME="k8s-cloud" KUBECTL="microk8s.kubectl" MICROK8S_VERSION=1.19 @@ -69,7 +71,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(){ @@ -149,7 +151,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"