From: madavi <jm00553988@techmahindra.com>
Date: Tue, 10 Sep 2019 11:16:39 +0000 (+0200)
Subject: Merge "Remove OSMLCM_VCA_CACERT"
X-Git-Tag: v7.0.0rc1~68
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=5311973b3bd700aa661d3f44607960919b387462;hp=-c;p=osm%2Fdevops.git

Merge "Remove OSMLCM_VCA_CACERT"
---

5311973b3bd700aa661d3f44607960919b387462
diff --combined installers/full_install_osm.sh
index be160d65,1d732a3a..2ae4c23a
--- 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"