X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Ffull_install_osm.sh;h=d2f5e5248210625f3d50f22794731a772875bd1a;hb=e38e8b15aee8668b14530152a3683e8f1cb79a86;hp=96d8b8b72a60c10b46b2c69250476eecc3dd57a5;hpb=961550439e2328d4c03d50cf83a04645abbc5175;p=osm%2Fdevops.git diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index 96d8b8b7..d2f5e524 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -162,7 +162,12 @@ function install_lxd() { # 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` @@ -215,7 +220,7 @@ function install_osmclient(){ python3 -m pip install -r /usr/lib/python3/dist-packages/osm_im/requirements.txt fi if [ -f /usr/lib/python3/dist-packages/osmclient/requirements.txt ]; then - sudo apt-get install -y libcurl4-openssl-dev libssl-dev + sudo apt-get install -y libcurl4-openssl-dev libssl-dev libmagic1 python3 -m pip install -r /usr/lib/python3/dist-packages/osmclient/requirements.txt fi [ -z "$INSTALL_LIGHTWEIGHT" ] && export OSM_HOSTNAME=`lxc list | awk '($2=="SO-ub"){print $6}'` @@ -871,7 +876,7 @@ function ctrl_c() { [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function } -LXD_VERSION=4.0 +LXD_VERSION=5.0 JUJU_VERSION=2.9 JUJU_AGENT_VERSION=2.9.29 UNINSTALL=""