X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Ffull_install_osm.sh;h=5d8d5bf80e2bf2b1f6e4be105aa9486f0c476a3d;hb=1184e3fd8cb70aefcbd3df630fa8af892962a652;hp=3276b143fe381970d73ff2428fb893aeff7affc1;hpb=56f3bbf7088fc6b15270e8240a7baf7d3bfe559f;p=osm%2Fdevops.git diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index 3276b143..5d8d5bf8 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -180,7 +180,7 @@ EONG remove_network $OSM_STACK_NAME echo "Removing $OSM_DOCKER_WORK_DIR" $WORKDIR_SUDO rm -rf $OSM_DOCKER_WORK_DIR - sg lxd -c "juju destroy-controller --yes $OSM_STACK_NAME" + sg lxd -c "juju destroy-controller --destroy-all-models --yes $OSM_STACK_NAME" fi echo "Some docker images will be kept in case they are used by other docker stacks" echo "To remove them, just run 'docker image prune' in a terminal" @@ -905,7 +905,7 @@ function deploy_lightweight() { echo "export KEYSTONEDB_TAG=${KEYSTONEDB_TAG}" | $WORKDIR_SUDO tee --append $OSM_DOCKER_WORK_DIR/osm_ports.sh pushd $OSM_DOCKER_WORK_DIR - sg docker -c "source ./osm_ports.sh; docker stack deploy -c $OSM_DOCKER_WORK_DIR/docker-compose.yaml $OSM_STACK_NAME" + sg docker -c ". ./osm_ports.sh; docker stack deploy -c $OSM_DOCKER_WORK_DIR/docker-compose.yaml $OSM_STACK_NAME" popd echo "Finished deployment of lightweight build" @@ -1154,7 +1154,7 @@ SHOWOPTS="" COMMIT_ID="" ASSUME_YES="" INSTALL_FROM_SOURCE="" -RELEASE="ReleaseFIVE" +RELEASE="ReleaseSIX" REPOSITORY="stable" INSTALL_VIMEMU="" INSTALL_FROM_LXDIMAGES=""