X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Ffull_install_osm.sh;h=596beb05958d56659e86ac49b8d3bdafc876ef87;hb=818fa5ac056bb64d5dc26429820ea17a33674228;hp=5297ccadbcadae99a1d02dfeed1c30a3171b90d0;hpb=76353e465e040bdf4e605e2521338df61eef136f;p=osm%2Fdevops.git diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index 5297ccad..596beb05 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -32,7 +32,7 @@ function usage(){ echo -e " -l : use specified repository url for lxd images" echo -e " -p : use specified repository path for lxd images" echo -e " --lightweight: install lightweight build of OSM (default installation)" - echo -e " --soui: install classic build of OSM (based on LXD containers, with SO and UI)" + echo -e " --soui: install classic build of OSM (Rel THREE v3.1, based on LXD containers, with SO and UI)" echo -e " --vimemu: additionally fetch, build, and deploy the VIM emulator as a docker container" echo -e " --develop: (deprecated, use '-b master') install OSM from source code using the master branch" # echo -e " --reconfigure: reconfigure the modules (DO NOT change NAT rules)" @@ -312,7 +312,9 @@ function configure_SOUI(){ echo -e " Configuring SO" sudo route add -host $JUJU_CONTROLLER_IP gw $VCA_CONTAINER_IP + sudo ip route add 10.44.127.0/24 via $VCA_CONTAINER_IP sudo sed -i "$ i route add -host $JUJU_CONTROLLER_IP gw $VCA_CONTAINER_IP" /etc/rc.local + sudo sed -i "$ i ip route add 10.44.127.0/24 via $VCA_CONTAINER_IP" /etc/rc.local # make journaling persistent lxc exec SO-ub -- mkdir -p /var/log/journal lxc exec SO-ub -- systemd-tmpfiles --create --prefix /var/log/journal @@ -748,7 +750,7 @@ while getopts ":hy-:b:r:k:u:R:l:p:D:" o; do [ "${OPTARG}" == "lxdinstall" ] && INSTALL_LXD="y" && continue [ "${OPTARG}" == "lxdimages" ] && INSTALL_FROM_LXDIMAGES="y" && continue [ "${OPTARG}" == "lightweight" ] && INSTALL_LIGHTWEIGHT="y" && continue - [ "${OPTARG}" == "soui" ] && INSTALL_LIGHTWEIGHT="" && continue + [ "${OPTARG}" == "soui" ] && INSTALL_LIGHTWEIGHT="" && RELEASE="-R ReleaseTHREE" && REPOSITORY="-r stable" && continue [ "${OPTARG}" == "vimemu" ] && INSTALL_VIMEMU="y" && continue [ "${OPTARG}" == "noconfigure" ] && NOCONFIGURE="y" && continue [ "${OPTARG}" == "showopts" ] && SHOWOPTS="y" && continue