From 3d1396d3ba47464f524abe1ebd50b2083af5686b Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Wed, 29 May 2019 13:00:07 +0200 Subject: [PATCH] Revert "installer: VCA CA certificate as env var for LCM" This reverts commit f37f12e191285c9e9960edf2d2dd6d82a166eaf9. Change-Id: I4d38e9a3aa95ce4ee4563b299b4208b01755934e Signed-off-by: garciadeblas --- installers/docker/__lcm__.env | 1 - installers/full_install_osm.sh | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/installers/docker/__lcm__.env b/installers/docker/__lcm__.env index 7341297b..ee19aff1 100644 --- a/installers/docker/__lcm__.env +++ b/installers/docker/__lcm__.env @@ -1,4 +1,3 @@ OSMLCM_VCA_HOST=__JUJU_CONTROLLER_IP__ OSMLCM_VCA_SECRET=__JUJU_PASSWORD__ OSMLCM_VCA_PUBKEY=__JUJU_PUBKEY__ -OSMLCM_VCA_CACERT=__JUJU_CACERT__ diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index d9ad8adb..3276b143 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -30,7 +30,6 @@ function usage(){ echo -e " -H use specific juju host controller IP" echo -e " -S use VCA/juju secret key" echo -e " -P use VCA/juju public key file" - echo -e " -C 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)" @@ -779,12 +778,6 @@ 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 - # RO MYSQL_ROOT_PASSWORD=$(generate_secret) if [ ! -f $OSM_DOCKER_WORK_DIR/ro-db.env ]; then @@ -1031,10 +1024,6 @@ 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"]') - [ -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" -- 2.25.1