From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Mon, 14 May 2018 11:54:20 +0000 (+0200)
Subject: Merge "OSM_HOSTNAME set to 127.0.0.1 instead of localhost to fix issues detected... 
X-Git-Tag: v4.0.0~9
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=726ba9ed0be625d297b0b3feca5866a7417bab88;hp=-c;p=osm%2Fdevops.git

Merge "OSM_HOSTNAME set to 127.0.0.1 instead of localhost to fix issues detected in some environments"
---

726ba9ed0be625d297b0b3feca5866a7417bab88
diff --combined installers/full_install_osm.sh
index 659c32db,8a3e3127..ad0e2043
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@@ -462,7 -462,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}"
@@@ -554,8 -554,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