Add NTP Sync

[osm/devops.git] / installers / charmed_install.sh

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index a011ef1..22144ad 100755 (executable)
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -15,11 +15,13 @@
 
 # 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}
 
@@ -27,7 +29,7 @@ MODEL_NAME=osm
 
 OSM_BUNDLE=cs:osm-66
 OSM_HA_BUNDLE=cs:osm-ha-51
-TAG=testing-daily
+TAG=10
 
 function check_arguments(){
     while [ $# -gt 0 ] ; do
@@ -71,7 +73,7 @@ function install_snaps(){
         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(){
@@ -151,7 +153,7 @@ EOF
         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"