From: madavi <jm00553988@techmahindra.com>
Date: Tue, 23 Jul 2019 10:03:18 +0000 (+0200)
Subject: Merge changes I1d0ee897,Iee1ed292
X-Git-Tag: v7.0.0rc1~89
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=a1b5bdbd86de48f3bfbf590e6148a311851cde39;hp=-c;p=osm%2Fdevops.git

Merge changes I1d0ee897,Iee1ed292

* changes:
  VCA CA certificate as env var for LCM
  full_install_osm.sh: escaping spaces in OSMLCM_VCA_PUBKEY
---

a1b5bdbd86de48f3bfbf590e6148a311851cde39
diff --combined installers/full_install_osm.sh
index 5d8d5bf8,89a0ba66..ffeb9605
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@@ -30,6 -30,7 +30,7 @@@ function usage()
      echo -e "     -H <VCA host>   use specific juju host controller IP"
      echo -e "     -S <VCA secret> use VCA/juju secret key"
      echo -e "     -P <VCA pubkey> use VCA/juju public key file"
+     echo -e "     -C <VCA cacert> use VCA/juju CA certificate file"
      echo -e "     --vimemu:       additionally deploy the VIM emulator as a docker container"
      echo -e "     --elk_stack:    additionally deploy an ELK docker stack for event logging"
      echo -e "     --pm_stack:     additionally deploy a Prometheus+Grafana stack for performance monitoring (PM)"
@@@ -180,7 -181,7 +181,7 @@@ EON
          remove_network $OSM_STACK_NAME
          echo "Removing $OSM_DOCKER_WORK_DIR"
          $WORKDIR_SUDO rm -rf $OSM_DOCKER_WORK_DIR
 -        sg lxd -c "juju destroy-controller --yes $OSM_STACK_NAME"
 +        sg lxd -c "juju destroy-controller --destroy-all-models --yes $OSM_STACK_NAME"
      fi
      echo "Some docker images will be kept in case they are used by other docker stacks"
      echo "To remove them, just run 'docker image prune' in a terminal"
@@@ -773,9 -774,15 +774,15 @@@ function generate_docker_env_files() 
      fi
  
      if ! grep -Fq "OSMLCM_VCA_PUBKEY" $OSM_DOCKER_WORK_DIR/lcm.env; then
-         echo "OSMLCM_VCA_PUBKEY=${OSM_VCA_PUBKEY}" | $WORKDIR_SUDO tee -a $OSM_DOCKER_WORK_DIR/lcm.env
+         echo "OSMLCM_VCA_PUBKEY=\"${OSM_VCA_PUBKEY}\"" | $WORKDIR_SUDO tee -a $OSM_DOCKER_WORK_DIR/lcm.env
      else
-         $WORKDIR_SUDO sed -i "s|OSMLCM_VCA_PUBKEY.*|OSMLCM_VCA_PUBKEY=$OSM_VCA_PUBKEY|g" $OSM_DOCKER_WORK_DIR/lcm.env
+         $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
  
      # RO
@@@ -1024,6 -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_DATABASE_COMMONKEY" ]; then
          OSM_DATABASE_COMMONKEY=$(generate_secret)
          [ -z "OSM_DATABASE_COMMONKEY" ] && FATAL "Cannot generate common db secret"
@@@ -1154,7 -1165,7 +1165,7 @@@ SHOWOPTS="
  COMMIT_ID=""
  ASSUME_YES=""
  INSTALL_FROM_SOURCE=""
 -RELEASE="ReleaseFIVE"
 +RELEASE="ReleaseSIX"
  REPOSITORY="stable"
  INSTALL_VIMEMU=""
  INSTALL_FROM_LXDIMAGES=""