From 779b1bfccb3583a8e232f8f80776de9ad5ee8284 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Wed, 22 May 2024 18:47:09 +0200 Subject: [PATCH] Remove use of INSTALL_LIGHTWEIGHT in full_install_osm.sh Change-Id: I0d191fe0c09f808a7958bc2537d3cab9af99b4d2 Signed-off-by: garciadeblas --- installers/full_install_osm.sh | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index c70fc060..a1508397 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -192,18 +192,10 @@ function install_osmclient(){ sudo DEBIAN_FRONTEND=noninteractive apt-get install -y libmagic1 python3 -m pip install -r /usr/lib/python3/dist-packages/osmclient/requirements.txt fi - [ -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}'` echo -e "\nOSM client installed" - if [ -z "$INSTALL_LIGHTWEIGHT" ]; then - echo -e "You might be interested in adding the following OSM client env variables to your .bashrc file:" - echo " export OSM_HOSTNAME=${OSM_HOSTNAME}" - echo " export OSM_RO_HOSTNAME=${OSM_RO_HOSTNAME}" - else - echo -e "OSM client assumes that OSM host is running in localhost (127.0.0.1)." - echo -e "In case you want to interact with a different OSM host, you will have to configure this env variable in your .bashrc file:" - echo " export OSM_HOSTNAME=" - fi + echo -e "OSM client assumes that OSM host is running in localhost (127.0.0.1)." + echo -e "In case you want to interact with a different OSM host, you will have to configure this env variable in your .bashrc file:" + echo " export OSM_HOSTNAME=https://nbi.${OSM_DEFAULT_IP}.nip.io" [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function return 0 } @@ -659,7 +651,6 @@ function dump_vars(){ echo "INSTALL_FROM_SOURCE=$INSTALL_FROM_SOURCE" echo "INSTALL_JUJU=$INSTALL_JUJU" echo "INSTALL_K8S_MONITOR=$INSTALL_K8S_MONITOR" - echo "INSTALL_LIGHTWEIGHT=$INSTALL_LIGHTWEIGHT" echo "INSTALL_LXD=$INSTALL_LXD" echo "INSTALL_NGSA=$INSTALL_NGSA" echo "INSTALL_DOCKER=$INSTALL_DOCKER" @@ -733,7 +724,6 @@ INSTALL_PLA="" INSTALL_VIMEMU="" LXD_REPOSITORY_BASE="https://osm-download.etsi.org/repository/osm/lxd" LXD_REPOSITORY_PATH="" -INSTALL_LIGHTWEIGHT="y" INSTALL_TO_OPENSTACK="" OPENSTACK_OPENRC_FILE_OR_CLOUD="" OPENSTACK_PUBLIC_NET_NAME="" -- 2.25.1