commit cef05e98f275060baf59f2e2f3ea5be2510b6771
author David Garcia <david.garcia@canonical.com> Thu Aug 20 12:08:31 2020 +0200
committer beierlm <mark.beierl@canonical.com> Thu Aug 20 13:35:16 2020 +0200
tree 25daf179ac408607782752f446b2f43d9c41df84
parent 19d019bbad8909f89cf1017b84c78e7fd9c27d6a

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>

installers/charmed_install.sh

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index 228a0e0..b411dbb 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -27,7 +27,7 @@
             --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 @@
     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