X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=installers%2Ffull_install_osm.sh;h=ad0e20439cc35b174b9c03995f5fe7535ce1652e;hb=726ba9ed0be625d297b0b3feca5866a7417bab88;hp=f79b9737057cb6ab3df532472b8b7e9355208dd9;hpb=432bcb2b12bc109e95f36c7c3ccf86a6cf925b65;p=osm%2Fdevops.git diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index f79b9737..ad0e2043 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -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 @@ -460,7 +462,7 @@ function install_osmclient(){ #echo 'export OSM_SOL005=True' >> ${HOME}/.bashrc [ -z "$INSTALL_LIGHTWEIGHT" ] && export OSM_HOSTNAME=`lxc list | awk '($2=="SO-ub"){print $6}'` [ -z "$INSTALL_LIGHTWEIGHT" ] && export OSM_RO_HOSTNAME=`lxc list | awk '($2=="RO"){print $6}'` - [ -n "$INSTALL_LIGHTWEIGHT" ] && export OSM_HOSTNAME=localhost + [ -n "$INSTALL_LIGHTWEIGHT" ] && export OSM_HOSTNAME=127.0.0.1 echo -e "\nOSM client installed" echo -e "You might be interested in adding the following OSM client env variables to your .bashrc file:" echo " export OSM_HOSTNAME=${OSM_HOSTNAME}" @@ -552,7 +554,8 @@ function generate_docker_images() { docker build ${LWTEMPDIR}/NBI -f ${LWTEMPDIR}/NBI/Dockerfile.local -t osm/nbi || ! echo "cannot build NBI docker image" >&2 git -C ${LWTEMPDIR} clone https://osm.etsi.org/gerrit/osm/RO docker build ${LWTEMPDIR}/RO -f ${LWTEMPDIR}/RO/docker/Dockerfile-local -t osm/ro || ! echo "cannot build RO docker image" >&2 - docker build ${LWTEMPDIR}/RO/lcm -t osm/lcm || ! echo "cannot build LCM docker image" >&2 + git -C ${LWTEMPDIR} clone https://osm.etsi.org/gerrit/osm/LCM + docker build ${LWTEMPDIR}/LCM -f ${LWTEMPDIR}/LCM/Dockerfile.local -t osm/lcm || ! echo "cannot build LCM docker image" >&2 # git -C ${LWTEMPDIR} clone https://github.com/superfluidity/osm-light-ui.git # docker build ${LWTEMPDIR}/osm-light-ui -t osm/light-ui -f ${LWTEMPDIR}/osm-light-ui/code/docker/Dockerfile git -C ${LWTEMPDIR} clone https://osm.etsi.org/gerrit/osm/LW-UI