From: David Garcia <david.garcia@canonical.com>
Date: Wed, 5 May 2021 17:01:43 +0000 (+0200)
Subject: Add --overlay option in charmed installer
X-Git-Tag: release-v10.0-start~14
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fdevops.git;a=commitdiff_plain;h=4bd2bf0082b177dab22ed0dbca1fd49a3be319b4

Add --overlay option in charmed installer

Change-Id: I99e2e8a27f7a930380a2fa686e2352b8fea69c7e
Signed-off-by: David Garcia <david.garcia@canonical.com>
---

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index e1a45d0b..123b29c5 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -33,6 +33,7 @@ function check_arguments(){
     while [ $# -gt 0 ] ; do
         case $1 in
             --bundle) BUNDLE="$2" ;;
+            --overlay) OVERLAY="$2" ;;
             --k8s) KUBECFG="$2" ;;
             --vca) CONTROLLER="$2" ;;
             --lxd) LXD_CLOUD="$2" ;;
@@ -249,10 +250,14 @@ function deploy_charmed_osm(){
     fi
     [ -v TAG ] && generate_images_overlay && images_overlay="--overlay $IMAGES_OVERLAY_FILE"
 
+    if [ -v OVERLAY ]; then
+        extra_overlay="--overlay $OVERLAY"
+    fi
+
     if [ -v BUNDLE ]; then
-        juju deploy -m $MODEL_NAME $BUNDLE --overlay ~/.osm/vca-overlay.yaml $images_overlay
+        juju deploy -m $MODEL_NAME $BUNDLE --overlay ~/.osm/vca-overlay.yaml $images_overlay $extra_overlay
     else
-        juju deploy -m $MODEL_NAME $OSM_BUNDLE --overlay ~/.osm/vca-overlay.yaml $images_overlay
+        juju deploy -m $MODEL_NAME $OSM_BUNDLE --overlay ~/.osm/vca-overlay.yaml $images_overlay $extra_overlay
     fi
 
     if [ ! -v KUBECFG ]; then
diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 57cc4fb9..42c2ed56 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -77,6 +77,7 @@ function usage(){
     echo -e "     [--lxd <yaml path>]:         Takes a YAML file as a parameter with the LXD Cloud information (--charmed option)"
     echo -e "     [--lxd-cred <yaml path>]:    Takes a YAML file as a parameter with the LXD Credentials information (--charmed option)"
     echo -e "     [--microstack]:              Installs microstack as a vim. (--charmed option)"
+    echo -e "     [--overlay]:                 Add an overlay to override some defaults of the default bundle (--charmed option)"
     echo -e "     [--ha]:                      Installs High Availability bundle. (--charmed option)"
     echo -e "     [--tag]:                     Docker image tag. (--charmed option)"
     echo -e "     [--registry]:                Docker registry with optional credentials as user:pass@hostname:port (--charmed option)"
@@ -1824,6 +1825,7 @@ while getopts ":b:r:c:n:k:u:R:D:o:O:m:N:H:S:s:w:t:U:P:A:l:L:K:d:p:T:f:F:-: hy" o
             [ "${OPTARG}" == "lxd" ] && continue
             [ "${OPTARG}" == "lxd-cred" ] && continue
             [ "${OPTARG}" == "microstack" ] && continue
+            [ "${OPTARG}" == "overlay" ] && continue
             [ "${OPTARG}" == "only-vca" ] && continue
             [ "${OPTARG}" == "vca" ] && continue
             [ "${OPTARG}" == "ha" ] && continue
diff --git a/installers/install_osm.sh b/installers/install_osm.sh
index f3798e4c..37e0467d 100755
--- a/installers/install_osm.sh
+++ b/installers/install_osm.sh
@@ -77,6 +77,7 @@ function usage(){
     echo -e "     [--lxd <yaml path>]:         Takes a YAML file as a parameter with the LXD Cloud information (--charmed option)"
     echo -e "     [--lxd-cred <yaml path>]:    Takes a YAML file as a parameter with the LXD Credentials information (--charmed option)"
     echo -e "     [--microstack]:              Installs microstack as a vim. (--charmed option)"
+    echo -e "     [--overlay]:                 Add an overlay to override some defaults of the default bundle (--charmed option)"
     echo -e "     [--ha]:                      Installs High Availability bundle. (--charmed option)"
     echo -e "     [--tag]:                     Docker image tag. (--charmed option)"
     echo -e "     [--registry]:                Docker registry with optional credentials as user:pass@hostname:port (--charmed option)"