projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adds image overlay to bundle
[osm/devops.git]
/
installers
/
charmed_install.sh
diff --git
a/installers/charmed_install.sh
b/installers/charmed_install.sh
index
3ebf179
..
94bd705
100755
(executable)
--- 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
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
if [ -v BUNDLE ]; then
- juju deploy $BUNDLE --overlay ~/.osm/vca-overlay.yaml
+ juju deploy $BUNDLE --overlay ~/.osm/vca-overlay.yaml
$images_overlay
else
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..."
juju deploy osm --overlay ~/.osm/vca-overlay.yaml $images_overlay
fi
echo "Waiting for deployment to finish..."