MODEL_NAME=osm
-OSM_BUNDLE=cs:osm-60
-OSM_HA_BUNDLE=cs:osm-ha-45
+OSM_BUNDLE=cs:osm-67
+OSM_HA_BUNDLE=cs:osm-ha-52
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" ;;
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
API_SERVER="$(echo $hostport | sed -e 's,:.*,,g')"
fi
# Expose OSM services
- juju config -m $MODEL_NAME nbi site_url=https://nbi.${API_SERVER}.xip.io
- juju config -m $MODEL_NAME ng-ui site_url=https://ui.${API_SERVER}.xip.io
- juju config -m $MODEL_NAME grafana site_url=https://grafana.${API_SERVER}.xip.io
- juju config -m $MODEL_NAME prometheus site_url=https://prometheus.${API_SERVER}.xip.io
+ juju config -m $MODEL_NAME nbi site_url=https://nbi.${API_SERVER}.nip.io
+ juju config -m $MODEL_NAME ng-ui site_url=https://ui.${API_SERVER}.nip.io
+ juju config -m $MODEL_NAME grafana site_url=https://grafana.${API_SERVER}.nip.io
+ juju config -m $MODEL_NAME prometheus site_url=https://prometheus.${API_SERVER}.nip.io
echo "Waiting for deployment to finish..."
check_osm_deployed