From: beierlm <mark.beierl@canonical.com>
Date: Wed, 8 Jul 2020 15:43:59 +0000 (-0400)
Subject: Adds image overlay to bundle
X-Git-Tag: v8.0.0rc3~17
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=b5332cf37ec941850e02abea916fead439c7dc1b;p=osm%2Fdevops.git

Adds image overlay to bundle

When installing using a bundle, the image overlay was not being
generated, resulting in the --tag option being ignored.

Bug 1130

Change-Id: I8e474d60b03abcb913d8586c8d643d099f1d8baf
Signed-off-by: beierlm <mark.beierl@canonical.com>
---

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index 3ebf1795..94bd7057 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -133,11 +133,11 @@ function deploy_charmed_osm(){
     fi
     echo "Deploying OSM with charms"
     # echo $BUNDLE
+    images_overlay=""
+    [ -v TAG ] && generate_images_overlay && images_overlay="--overlay $IMAGES_OVERLAY_FILE"
     if [ -v BUNDLE ]; then
-        juju deploy $BUNDLE --overlay ~/.osm/vca-overlay.yaml
+        juju deploy $BUNDLE --overlay ~/.osm/vca-overlay.yaml $images_overlay
     else
-        images_overlay=""
-        [ -v TAG ] && generate_images_overlay && images_overlay="--overlay $IMAGES_OVERLAY_FILE"
         juju deploy osm --overlay ~/.osm/vca-overlay.yaml $images_overlay
     fi
     echo "Waiting for deployment to finish..."