From a2e418487ee61db3b153aa928e0264b8c6ff8a40 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Wed, 18 Dec 2019 11:05:24 +0100 Subject: [PATCH] Additional commented env variables for LCM to accelerate charm deployment Change-Id: I4ee55143424065fabe052559cfd7544c0104cf76 Signed-off-by: garciadeblas --- docker/LCM/Dockerfile | 10 +++++++--- installers/full_install_osm.sh | 8 ++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) 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 -- 2.25.1