X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharmed_install.sh;h=e11b2b5d4ddb6669087e0c5aec2f4aa66a52812e;hb=8eff33a4455f10fb0bff553a39e7966f0d566fde;hp=8bcc71932224daeef9ce7a51c7e4539f18dd8cc0;hpb=457fde18dad36d9d58c794918ca79e6d72539bc1;p=osm%2Fdevops.git

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index 8bcc7193..e11b2b5d 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -15,12 +15,13 @@
 
 # set -eux
 
+LXD_VERSION=4.0
 JUJU_VERSION=2.9
-JUJU_AGENT_VERSION=2.9.9
+JUJU_AGENT_VERSION=2.9.22
 K8S_CLOUD_NAME="k8s-cloud"
 KUBECTL="microk8s.kubectl"
-MICROK8S_VERSION=1.20
-OSMCLIENT_VERSION=10.0
+MICROK8S_VERSION=1.23
+OSMCLIENT_VERSION=11.0
 IMAGES_OVERLAY_FILE=~/.osm/images-overlay.yaml
 PATH=/snap/bin:${PATH}
 
@@ -34,7 +35,7 @@ MODEL_NAME=osm
 # charms to CharmHub.
 OSM_BUNDLE=/usr/share/osm-devops/installers/charm/bundles/osm/bundle.yaml
 OSM_HA_BUNDLE=/usr/share/osm-devops/installers/charm/bundles/osm-ha/bundle.yaml
-TAG=testing-daily
+TAG=11
 
 function check_arguments(){
     while [ $# -gt 0 ] ; do
@@ -158,7 +159,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"
@@ -285,6 +286,10 @@ function deploy_charmed_osm(){
 
     echo "Waiting for deployment to finish..."
     check_osm_deployed
+    grafana_leader=`juju status -m $MODEL_NAME grafana | grep "*" | cut -d "*" -f 1`
+    grafana_admin_password=`juju run -m $MODEL_NAME --unit $grafana_leader "echo \\$GF_SECURITY_ADMIN_PASSWORD"`
+    juju config -m $MODEL_NAME mon grafana_password=$grafana_admin_password
+    check_osm_deployed
     echo "OSM with charms deployed"
 }