X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharmed_install.sh;h=59c4397720c66362e2c0079694899668025ecc34;hb=cb7dc67d460141b98472561ce080cf378c9cd785;hp=2cd9a07c969da44fbd2e72de3514196c6a9b0e40;hpb=58ac3a531199520059e182b67571708048220ab6;p=osm%2Fdevops.git diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh index 2cd9a07c..59c43977 100755 --- a/installers/charmed_install.sh +++ b/installers/charmed_install.sh @@ -15,9 +15,9 @@ # set -eux -LXD_VERSION=4.0 +LXD_VERSION=5.0 JUJU_VERSION=2.9 -JUJU_AGENT_VERSION=2.9.33 +JUJU_AGENT_VERSION=2.9.34 K8S_CLOUD_NAME="k8s-cloud" KUBECTL="microk8s.kubectl" MICROK8S_VERSION=1.23 @@ -177,7 +177,12 @@ EOF sudo sysctl --system # Install LXD snap sudo apt-get remove --purge -y liblxc1 lxc-common lxcfs lxd lxd-client - sudo snap install lxd --channel $LXD_VERSION/stable + snap info lxd | grep installed > /dev/null + if [ $? -eq 0 ]; then + sudo snap refresh lxd --channel $LXD_VERSION/stable + else + sudo snap install lxd --channel $LXD_VERSION/stable + fi # 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" @@ -392,7 +397,7 @@ EOF cat << EOF >> /tmp/images-overlay.yaml ${charm}: resources: - image: /tmp/${charm}_registry.yaml + ${charm}-image: /tmp/${charm}_registry.yaml EOF done