projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removing pydantic from LCM charm
[osm/devops.git]
/
installers
/
charmed_install.sh
diff --git
a/installers/charmed_install.sh
b/installers/charmed_install.sh
index
75a7259
..
4d04a91
100755
(executable)
--- a/
installers/charmed_install.sh
+++ b/
installers/charmed_install.sh
@@
-24,6
+24,9
@@
PATH=/snap/bin:${PATH}
MODEL_NAME=osm
MODEL_NAME=osm
+OSM_BUNDLE=cs:osm-54
+OSM_HA_BUNDLE=cs:osm-ha-40
+
function check_arguments(){
while [ $# -gt 0 ] ; do
case $1 in
function check_arguments(){
while [ $# -gt 0 ] ; do
case $1 in
@@
-33,7
+36,7
@@
function check_arguments(){
--lxd) LXD_CLOUD="$2" ;;
--lxd-cred) LXD_CREDENTIALS="$2" ;;
--microstack) MICROSTACK=y ;;
--lxd) LXD_CLOUD="$2" ;;
--lxd-cred) LXD_CREDENTIALS="$2" ;;
--microstack) MICROSTACK=y ;;
- --ha) BUNDLE=
"cs:osm-ha"
;;
+ --ha) BUNDLE=
$OSM_HA_BUNDLE
;;
--tag) TAG="$2" ;;
--registry) REGISTRY_INFO="$2" ;;
esac
--tag) TAG="$2" ;;
--registry) REGISTRY_INFO="$2" ;;
esac
@@
-242,7
+245,7
@@
function deploy_charmed_osm(){
if [ -v BUNDLE ]; then
juju deploy -m $MODEL_NAME $BUNDLE --overlay ~/.osm/vca-overlay.yaml $images_overlay
else
if [ -v BUNDLE ]; then
juju deploy -m $MODEL_NAME $BUNDLE --overlay ~/.osm/vca-overlay.yaml $images_overlay
else
- juju deploy -m $MODEL_NAME
cs:osm-53
--overlay ~/.osm/vca-overlay.yaml $images_overlay
+ juju deploy -m $MODEL_NAME
$OSM_BUNDLE
--overlay ~/.osm/vca-overlay.yaml $images_overlay
fi
echo "Waiting for deployment to finish..."
fi
echo "Waiting for deployment to finish..."