X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharmed_install.sh;h=4c5c18f0514a772e87649912cd966f58acb5bc7a;hb=ccabbe39368ab73645caa6ab469be795cae66df5;hp=e215ef2bc78d9662e152b803e3d654b2acdf53c4;hpb=e2dd10f7fab0315302fd00869d59ae1368e36757;p=osm%2Fdevops.git

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index e215ef2b..4c5c18f0 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -15,7 +15,9 @@
 
 # set -eux
 
-JUJU_AGENT_VERSION=2.8.8
+LXD_VERSION=4.0
+JUJU_VERSION=2.8
+JUJU_AGENT_VERSION=2.8.11
 K8S_CLOUD_NAME="k8s-cloud"
 KUBECTL="microk8s.kubectl"
 MICROK8S_VERSION=1.19
@@ -69,7 +71,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(){
@@ -149,7 +151,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"
@@ -271,16 +273,16 @@ function deploy_charmed_osm(){
 
     # Expose OSM services
     # Expose NBI
-    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 nbi site_url=https://nbi.${API_SERVER}.nip.io
+    juju config -m $MODEL_NAME ng-ui site_url=https://ui.${API_SERVER}.nip.io
 
     # Expose Grafana
-    juju config -m $MODEL_NAME grafana-k8s juju-external-hostname=grafana.${API_SERVER}.xip.io
+    juju config -m $MODEL_NAME grafana-k8s juju-external-hostname=grafana.${API_SERVER}.nip.io
     juju expose -m $MODEL_NAME grafana-k8s
     wait_for_port grafana-k8s 0
 
     # Expose Prometheus
-    juju config -m $MODEL_NAME prometheus-k8s juju-external-hostname=prometheus.${API_SERVER}.xip.io
+    juju config -m $MODEL_NAME prometheus-k8s juju-external-hostname=prometheus.${API_SERVER}.nip.io
     juju expose -m $MODEL_NAME prometheus-k8s
     wait_for_port prometheus-k8s 1