X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=installers%2Fcharmed_install.sh;h=8a517085ec293222ecca0af80a7df8e08a9a9092;hb=d0cb0efebf646b6ef9870ae2aacbc3915829d42a;hp=e0c3e02a9d0a33c20f660ca29f0d1ef00b510e53;hpb=c395a45423e2f7cce7edae2ab4168d9ec5b51d49;p=osm%2Fdevops.git diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh index e0c3e02a..8a517085 100755 --- a/installers/charmed_install.sh +++ b/installers/charmed_install.sh @@ -25,14 +25,15 @@ PATH=/snap/bin:${PATH} MODEL_NAME=osm -OSM_BUNDLE=cs:osm-60 -OSM_HA_BUNDLE=cs:osm-ha-45 +OSM_BUNDLE=cs:osm-64 +OSM_HA_BUNDLE=cs:osm-ha-49 TAG=testing-daily 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