From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Wed, 18 Dec 2019 10:05:24 +0000 (+0100)
Subject: Additional commented env variables for LCM to accelerate charm deployment
X-Git-Tag: v7.0.1rc2~1^2~6
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F22%2F8422%2F1;p=osm%2Fdevops.git

Additional commented env variables for LCM to accelerate charm deployment

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

diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile
index e7a86cb8..5ee783f3 100644
--- a/docker/LCM/Dockerfile
+++ b/docker/LCM/Dockerfile
@@ -107,9 +107,13 @@ ENV OSMLCM_RO_TENANT       osm
 
 # VCA
 ENV OSMLCM_VCA_HOST        vca
-ENV OSMLCM_VCA_PORT:       17070
-ENV OSMLCM_VCA_USER:       admin
-ENV OSMLCM_VCA_SECRET:     secret
+ENV OSMLCM_VCA_PORT       17070
+ENV OSMLCM_VCA_USER       admin
+ENV OSMLCM_VCA_SECRET     secret
+# ENV OSMLCM_VCA_PUBKEY     pubkey
+# ENV OSMLCM_VCA_CACERT     cacert
+# ENV OSMLCM_VCA_ENABLEOSUPGRADE false
+# ENV OSMLCM_VCA_APTMIRROR  http://archive.ubuntu.com/ubuntu/
 
 # database
 ENV OSMLCM_DATABASE_DRIVER mongo
diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index ead32dce..42df6e17 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -914,6 +914,14 @@ function generate_docker_env_files() {
         $WORKDIR_SUDO sed -i "s|OSMLCM_VCA_APIPROXY.*|OSMLCM_VCA_APIPROXY=${OSM_VCA_APIPROXY}|g" $OSM_DOCKER_WORK_DIR/lcm.env
     fi
 
+    if ! grep -Fq "OSMLCM_VCA_ENABLEOSUPGRADE" $OSM_DOCKER_WORK_DIR/lcm.env; then
+        echo "# OSMLCM_VCA_ENABLEOSUPGRADE=false" | $WORKDIR_SUDO tee -a $OSM_DOCKER_WORK_DIR/lcm.env
+    fi
+
+    if ! grep -Fq "OSMLCM_VCA_APTMIRROR" $OSM_DOCKER_WORK_DIR/lcm.env; then
+        echo "# OSMLCM_VCA_APTMIRROR=http://archive.ubuntu.com/ubuntu/" | $WORKDIR_SUDO tee -a $OSM_DOCKER_WORK_DIR/lcm.env
+    fi
+
     # RO
     MYSQL_ROOT_PASSWORD=$(generate_secret)
     if [ ! -f $OSM_DOCKER_WORK_DIR/ro-db.env ]; then