projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update lxd version to 5.0
[osm/devops.git]
/
installers
/
full_install_osm.sh
diff --git
a/installers/full_install_osm.sh
b/installers/full_install_osm.sh
index
96d8b8b
..
d2f5e52
100755
(executable)
--- 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
# 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`
# 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
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}'`
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
}
[ -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=""
JUJU_VERSION=2.9
JUJU_AGENT_VERSION=2.9.29
UNINSTALL=""