projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug 1811 - Disabling RO OpenNebula plugin
[osm/devops.git]
/
installers
/
full_install_osm.sh
diff --git
a/installers/full_install_osm.sh
b/installers/full_install_osm.sh
index
70b9dca
..
941e51e
100755
(executable)
--- a/
installers/full_install_osm.sh
+++ b/
installers/full_install_osm.sh
@@
-293,7
+293,7
@@
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
+ sudo snap install lxd
--channel $LXD_VERSION/stable
# Configure LXD
sudo usermod -a -G lxd `whoami`
# Configure LXD
sudo usermod -a -G lxd `whoami`
@@
-447,7
+447,7
@@
function install_docker_compose() {
function install_juju() {
echo "Installing juju"
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}"
update_juju_images
echo "Finished installation of juju"
[[ ":$PATH": != *":/snap/bin:"* ]] && PATH="/snap/bin:${PATH}"
update_juju_images
echo "Finished installation of juju"
@@
-1575,6
+1575,8
@@
function parse_docker_registry_url() {
DOCKER_REGISTRY_URL=$(echo "$DOCKER_REGISTRY_URL" | awk '{split($1,a,"@"); print a[2]}')
}
DOCKER_REGISTRY_URL=$(echo "$DOCKER_REGISTRY_URL" | awk '{split($1,a,"@"); print a[2]}')
}
+LXD_VERSION=4.0
+JUJU_VERSION=2.8
JUJU_AGENT_VERSION=2.8.8
UNINSTALL=""
DEVELOP=""
JUJU_AGENT_VERSION=2.8.8
UNINSTALL=""
DEVELOP=""