From: David Garcia <david.garcia@canonical.com>
Date: Thu, 20 Aug 2020 10:08:31 +0000 (+0200)
Subject: Fix the osm bundle names
X-Git-Tag: release-v9.0-start~78
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F13%2F9613%2F2;p=osm%2Fdevops.git

Fix the osm bundle names

Fixes the following problem:
    - ERROR The charm or bundle "osm" is ambiguous.
    - This was happening if a folder "osm" existed in the current directory

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

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index 228a0e05..b411dbbf 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -27,7 +27,7 @@ function check_arguments(){
             --lxd) LXD_CLOUD="$2" ;;
             --lxd-cred) LXD_CREDENTIALS="$2" ;;
             --microstack) MICROSTACK=y ;;
-            --ha) BUNDLE="osm-ha" ;;
+            --ha) BUNDLE="cs:osm-ha" ;;
             --tag) TAG="$2" ;;
         esac
         shift
@@ -136,7 +136,7 @@ function deploy_charmed_osm(){
     else
         images_overlay=""
         [ -v TAG ] && generate_images_overlay && images_overlay="--overlay $IMAGES_OVERLAY_FILE"
-        juju deploy osm --overlay ~/.osm/vca-overlay.yaml $images_overlay
+        juju deploy cs:osm --overlay ~/.osm/vca-overlay.yaml $images_overlay
     fi
     echo "Waiting for deployment to finish..."
     check_osm_deployed &> /dev/null