From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Tue, 10 Sep 2019 15:30:08 +0000 (+0200)
Subject: Merge "full_install_osm.sh: updated retrieval of README files"
X-Git-Tag: v7.0.0rc1~67
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=d081690f8603c9c7d1534cb8c0c01bf23de1d086;hp=-c;p=osm%2Fdevops.git

Merge "full_install_osm.sh: updated retrieval of README files"
---

d081690f8603c9c7d1534cb8c0c01bf23de1d086
diff --combined installers/full_install_osm.sh
index 2ae4c23a,c4071ef4..9ac0d827
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@@ -544,8 -544,8 +544,8 @@@ function install_osmclient()
      sudo add-apt-repository -y "deb [arch=amd64] $CLIENT_REPOSITORY_BASE/$CLIENT_RELEASE $CLIENT_REPOSITORY osmclient"
      sudo apt-get update
      sudo apt-get install -y python-pip
 -    sudo -H LC_ALL=C pip install pip==9.0.3
 -    sudo -H LC_ALL=C pip install python-magic
 +    sudo -H LC_ALL=C pip install -U pip
 +    sudo -H LC_ALL=C python -m pip install python-magic
      sudo apt-get install -y python-osmclient
      #sed 's,OSM_SOL005=[^$]*,OSM_SOL005=True,' -i ${HOME}/.bashrc
      #echo 'export OSM_HOSTNAME=localhost' >> ${HOME}/.bashrc
@@@ -779,11 -779,11 +779,11 @@@ function generate_docker_env_files() 
          $WORKDIR_SUDO sed -i "s|OSMLCM_VCA_PUBKEY.*|OSMLCM_VCA_PUBKEY=\"${OSM_VCA_PUBKEY}\"|g" $OSM_DOCKER_WORK_DIR/lcm.env
      fi
  
 -    if ! grep -Fq "OSMLCM_VCA_CACERT" $OSM_DOCKER_WORK_DIR/lcm.env; then
 -        echo "OSMLCM_VCA_CACERT=\"${OSM_VCA_CACERT}\"" | $WORKDIR_SUDO tee -a $OSM_DOCKER_WORK_DIR/lcm.env
 -    else
 -        $WORKDIR_SUDO sed -i "s|OSMLCM_VCA_CACERT.*|OSMLCM_VCA_CACERT=\"${OSM_VCA_CACERT}\"|g" $OSM_DOCKER_WORK_DIR/lcm.env
 -    fi
 +    #if ! grep -Fq "OSMLCM_VCA_CACERT" $OSM_DOCKER_WORK_DIR/lcm.env; then
 +    #    echo "OSMLCM_VCA_CACERT=\"${OSM_VCA_CACERT}\"" | $WORKDIR_SUDO tee -a $OSM_DOCKER_WORK_DIR/lcm.env
 +    #else
 +    #    $WORKDIR_SUDO sed -i "s|OSMLCM_VCA_CACERT.*|OSMLCM_VCA_CACERT=\"${OSM_VCA_CACERT}\"|g" $OSM_DOCKER_WORK_DIR/lcm.env
 +    #fi
  
      # RO
      MYSQL_ROOT_PASSWORD=$(generate_secret)
@@@ -1031,10 -1031,10 +1031,10 @@@ function install_lightweight() 
          OSM_VCA_PUBKEY=$(cat $HOME/.local/share/juju/ssh/juju_id_rsa.pub)
          [ -z "$OSM_VCA_PUBKEY" ] && FATAL "Cannot obtain juju public key"
      fi
 -    if [ -z "$OSM_VCA_CACERT" ]; then
 -	OSM_VCA_CACERT=$(juju controllers --format json | jq -r '.controllers["osm"]["ca-cert"]' | grep -v "\-\-\-\-\-.*CERTIFICATE\-\-\-\-\-")
 -        [ -z "$OSM_VCA_CACERT" ] && FATAL "Cannot obtain juju CA certificate"
 -    fi
 +    #if [ -z "$OSM_VCA_CACERT" ]; then
 +	#OSM_VCA_CACERT=$(juju controllers --format json | jq -r '.controllers["osm"]["ca-cert"]' | grep -v "\-\-\-\-\-.*CERTIFICATE\-\-\-\-\-")
 +    #    [ -z "$OSM_VCA_CACERT" ] && FATAL "Cannot obtain juju CA certificate"
 +    #fi
      if [ -z "$OSM_DATABASE_COMMONKEY" ]; then
          OSM_DATABASE_COMMONKEY=$(generate_secret)
          [ -z "OSM_DATABASE_COMMONKEY" ] && FATAL "Cannot generate common db secret"
@@@ -1062,7 -1062,7 +1062,7 @@@
      [ -n "$INSTALL_PERFMON" ] && deploy_perfmon && track perfmon
      [ -z "$INSTALL_NOHOSTCLIENT" ] && install_osmclient
      track osmclient
-     wget -q -O- https://osm-download.etsi.org/ftp/osm-5.0-five/README2.txt &> /dev/null
+     wget -q -O- https://osm-download.etsi.org/ftp/osm-6.0-six/sixME2.txt &> /dev/null
      track end
      return 0
  }
@@@ -1392,7 -1392,7 +1392,7 @@@ OSM_JENKINS="$OSM_DEVOPS/jenkins
  [ -n "$INSTALL_ONLY" ] && echo -e "\nDONE" && exit 0
  
  #Installation starts here
- wget -q -O- https://osm-download.etsi.org/ftp/osm-5.0-five/README.txt &> /dev/null
+ wget -q -O- https://osm-download.etsi.org/ftp/osm-6.0-six/README.txt &> /dev/null
  track start
  
  [ -n "$INSTALL_LIGHTWEIGHT" ] && install_lightweight && echo -e "\nDONE" && exit 0
@@@ -1448,6 -1448,6 +1448,6 @@@ f
  #Install vim-emu (optional)
  [ -n "$INSTALL_VIMEMU" ] && install_docker_ce && install_vimemu
  
- wget -q -O- https://osm-download.etsi.org/ftp/osm-5.0-five/README2.txt &> /dev/null
+ wget -q -O- https://osm-download.etsi.org/ftp/osm-6.0-six/README2.txt &> /dev/null
  track end
  echo -e "\nDONE"