projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
full_install_osm.sh: fix k8s installation, node must be tainted before juju_addk8s...
[osm/devops.git]
/
installers
/
charmed_install.sh
diff --git
a/installers/charmed_install.sh
b/installers/charmed_install.sh
index
228a0e0
..
b411dbb
100755
(executable)
--- 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 ;;
--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
--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"
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
fi
echo "Waiting for deployment to finish..."
check_osm_deployed &> /dev/null