commit 5a50a063bb187a1da368254c79ad1a4b8c0f0042
author Adam Israel <adam.israel@canonical.com> Mon Sep 09 11:33:13 2019 +0300
committer Adam Israel <adam.israel@canonical.com> Mon Sep 09 11:52:31 2019 +0300
tree 070420688f5983d97734ce9c75c204cc83efcc8b
parent 67001add5264b6e16930cc54942f84833964b6e6

Remove OSMLCM_VCA_CACERT

Removes the OSMLCM_VCA_CACERT variable from __lcm__.env in order to fix
the VCA. This works around the parsing of the OSMLCM_VCA_CACERT in
full_install.sh, which currently truncates the cert, causing it to be
invalid.

Change-Id: I8e8c8199bc27ac919e4bf7e6442e6746bb503c8a
Signed-off-by: Adam Israel <adam.israel@canonical.com>

installers/full_install_osm.sh

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 167ca87..1d732a3 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -779,11 +779,11 @@
         $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 @@
         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"