# set -eux
-JUJU_AGENT_VERSION=2.8.9
+LXD_VERSION=4.0
+JUJU_VERSION=2.8
+JUJU_AGENT_VERSION=2.8.13
K8S_CLOUD_NAME="k8s-cloud"
KUBECTL="microk8s.kubectl"
-MICROK8S_VERSION=1.19
-OSMCLIENT_VERSION=9.0
+MICROK8S_VERSION=1.20
+OSMCLIENT_VERSION=10.0
IMAGES_OVERLAY_FILE=~/.osm/images-overlay.yaml
PATH=/snap/bin:${PATH}
MODEL_NAME=osm
-OSM_BUNDLE=cs:osm-60
-OSM_HA_BUNDLE=cs:osm-ha-45
-TAG=testing-daily
+OSM_BUNDLE=cs:osm-66
+OSM_HA_BUNDLE=cs:osm-ha-51
+TAG=10
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" ;;
export KUBECONFIG=${KUBECFG}
KUBEGRP=$(id -g -n)
fi
- sudo snap install juju --classic --channel=2.8/stable
+ sudo snap install juju --classic --channel=$JUJU_VERSION/stable
}
function bootstrap_k8s_lxd(){
sudo sysctl --system
# Install LXD snap
sudo apt-get remove --purge -y liblxc1 lxc-common lxcfs lxd lxd-client
- sudo snap install lxd
+ sudo snap install lxd --channel $LXD_VERSION/stable
# Configure LXD
sudo usermod -a -G lxd `whoami`
cat /usr/share/osm-devops/installers/lxd-preseed.conf | sed 's/^config: {}/config:\n core.https_address: '$LXDENDPOINT':8443/' | sg lxd -c "lxd init --preseed"
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