X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Finstall_osm.sh;h=e260510338da06082e8c7e4d4aecf4241089072d;hb=refs%2Fchanges%2F07%2F6007%2F1;hp=2c4361fd00d51e387dc654f91ae8e07ffa7ee12e;hpb=00b76aa0b587b1794653e339570017588d102a52;p=osm%2Fdevops.git diff --git a/installers/install_osm.sh b/installers/install_osm.sh index 2c4361fd..e2605103 100755 --- a/installers/install_osm.sh +++ b/installers/install_osm.sh @@ -413,7 +413,7 @@ function launch_container_from_lxd(){ function install_osmclient(){ CLIENT_RELEASE=${RELEASE#"-R "} CLIENT_REPOSITORY_KEY="OSM%20ETSI%20Release%20Key.gpg" - CLIENT_REPOSITORY="stable" + CLIENT_REPOSITORY=${REPOSITORY#"-r "} [ -z "$REPOSITORY_BASE" ] && REPOSITORY_BASE="-u https://osm-download.etsi.org/repository/osm/debian" CLIENT_REPOSITORY_BASE=${REPOSITORY_BASE#"-u "} key_location=$CLIENT_REPOSITORY_BASE/$CLIENT_RELEASE/$CLIENT_REPOSITORY_KEY @@ -424,6 +424,9 @@ function install_osmclient(){ #sed 's,OSM_SOL005=[^$]*,OSM_SOL005=True,' -i ${HOME}/.bashrc #echo 'export OSM_HOSTNAME=localhost' >> ${HOME}/.bashrc #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 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}" @@ -639,6 +642,7 @@ COMMIT_ID="" ASSUME_YES="" INSTALL_FROM_SOURCE="" RELEASE="-R ReleaseTHREE" +REPOSITORY="-r stable" INSTALL_VIMEMU="" INSTALL_FROM_LXDIMAGES="" LXD_REPOSITORY_BASE="https://osm-download.etsi.org/repository/osm/lxd"