commit f37f12e191285c9e9960edf2d2dd6d82a166eaf9
author garciadeblas <gerardo.garciadeblas@telefonica.com> Wed May 22 18:00:54 2019 +0200
committer garciadeblas <gerardo.garciadeblas@telefonica.com> Fri May 24 22:35:52 2019 +0200
tree 0f6d584bc3474df45af9a7df8af312b17c089a7f
parent 85c04585f09df151f72ac643ccba5acf0718d3ac

installer: VCA CA certificate as env var for LCM

Change-Id: I741a430b069c2ec0f70939fbde266029f0199053
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

installers/docker/__lcm__.env

diff --git a/installers/docker/__lcm__.env b/installers/docker/__lcm__.env
index ee19aff..7341297 100644
--- a/installers/docker/__lcm__.env
+++ b/installers/docker/__lcm__.env
@@ -1,3 +1,4 @@
 OSMLCM_VCA_HOST=__JUJU_CONTROLLER_IP__
 OSMLCM_VCA_SECRET=__JUJU_PASSWORD__
 OSMLCM_VCA_PUBKEY=__JUJU_PUBKEY__
+OSMLCM_VCA_CACERT=__JUJU_CACERT__

installers/full_install_osm.sh

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 3276b14..d9ad8ad 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -30,6 +30,7 @@
     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)"
@@ -778,6 +779,12 @@
         $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
     MYSQL_ROOT_PASSWORD=$(generate_secret)
     if [ ! -f $OSM_DOCKER_WORK_DIR/ro-db.env ]; then
@@ -1024,6 +1031,10 @@
         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"]')
+        [ -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"