X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharmed_install.sh;h=4cee0a3751bec1ad6c201a95add23b46661f6552;hb=HEAD;hp=e7f63b01a2c155d264e1cc8fcf39385f27dc883d;hpb=7735f6a86e290c0c15c4f41f5f81b5930b14cc73;p=osm%2Fdevops.git

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index e7f63b01..1e406ddb 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -17,10 +17,10 @@
 
 LXD_VERSION=5.0
 JUJU_VERSION=2.9
-JUJU_AGENT_VERSION=2.9.35
+JUJU_AGENT_VERSION=2.9.43
 K8S_CLOUD_NAME="k8s-cloud"
 KUBECTL="microk8s.kubectl"
-MICROK8S_VERSION=1.23
+MICROK8S_VERSION=1.26
 OSMCLIENT_VERSION=latest
 IMAGES_OVERLAY_FILE=~/.osm/images-overlay.yaml
 PASSWORD_OVERLAY_FILE=~/.osm/password-overlay.yaml
@@ -76,6 +76,11 @@ function install_snaps(){
         sudo snap install microk8s --classic --channel=${MICROK8S_VERSION}/stable ||
           FATAL_TRACK k8scluster "snap install microk8s ${MICROK8S_VERSION}/stable failed"
         sudo usermod -a -G microk8s `whoami`
+        # Workaround bug in calico MTU detection
+        if [ ${DEFAULT_IF_MTU} -ne 1500 ] ; then
+            sudo mkdir -p /var/lib/calico
+            sudo ln -sf /var/snap/microk8s/current/var/lib/calico/mtu /var/lib/calico/mtu
+        fi
         sudo cat /var/snap/microk8s/current/args/kube-apiserver | grep advertise-address || (
                 echo "--advertise-address $DEFAULT_IP" | sudo tee -a /var/snap/microk8s/current/args/kube-apiserver
                 sg ${KUBEGRP} -c microk8s.stop
@@ -137,7 +142,7 @@ EOF
     else
         sg ${KUBEGRP} -c "echo ${DEFAULT_IP}-${DEFAULT_IP} | microk8s.enable metallb"
         sg ${KUBEGRP} -c "microk8s.enable ingress"
-        sg ${KUBEGRP} -c "microk8s.enable storage dns"
+        sg ${KUBEGRP} -c "microk8s.enable hostpath-storage dns"
         TIME_TO_WAIT=30
         start_time="$(date -u +%s)"
         while true
@@ -187,9 +192,6 @@ EOF
               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"
               sg lxd -c "lxd waitready"
-              DEFAULT_MTU=$(ip addr show $DEFAULT_IF | perl -ne 'if (/mtu\s(\d+)/) {print $1;}')
-              sg lxd -c "lxc profile device set default eth0 mtu $DEFAULT_MTU"
-              sg lxd -c "lxc network set lxdbr0 bridge.mtu $DEFAULT_MTU"
 
               cat << EOF > $LXD_CLOUD
 clouds:
@@ -282,12 +284,20 @@ function deploy_charmed_osm(){
         API_SERVER="$(echo $hostport | sed -e 's,:.*,,g')"
     fi
     # Configure VCA Integrator
-    juju config vca \
-      k8s-cloud=microk8s \
-      lxd-cloud=lxd-cloud:lxd-cloud \
-      controllers="`cat ~/.local/share/juju/controllers.yaml`" \
-      accounts="`cat ~/.local/share/juju/accounts.yaml`" \
-      public-key="`cat ~/.local/share/juju/ssh/juju_id_rsa.pub`"
+    if [ ! -v INSTALL_NOLXD ]; then
+        juju config vca \
+          k8s-cloud=microk8s \
+          lxd-cloud=lxd-cloud:lxd-cloud \
+          controllers="`cat ~/.local/share/juju/controllers.yaml`" \
+          accounts="`cat ~/.local/share/juju/accounts.yaml`" \
+          public-key="`cat ~/.local/share/juju/ssh/juju_id_rsa.pub`"
+    else
+        juju config vca \
+          k8s-cloud=microk8s \
+          controllers="`cat ~/.local/share/juju/controllers.yaml`" \
+          accounts="`cat ~/.local/share/juju/accounts.yaml`" \
+          public-key="`cat ~/.local/share/juju/ssh/juju_id_rsa.pub`"
+    fi
     # Expose OSM services
     juju config -m $MODEL_NAME nbi external-hostname=nbi.${API_SERVER}.nip.io
     juju config -m $MODEL_NAME ng-ui external-hostname=ui.${API_SERVER}.nip.io
@@ -397,7 +407,7 @@ EOF
         cat << EOF >> /tmp/images-overlay.yaml
   ${charm}:
     resources:
-      image: /tmp/${charm}_registry.yaml
+      ${charm}-image: /tmp/${charm}_registry.yaml
 
 EOF
     done
@@ -533,6 +543,7 @@ function install_microstack() {
 
 DEFAULT_IF=`ip route list match 0.0.0.0 | awk '{print $5; exit}'`
 DEFAULT_IP=`ip -o -4 a |grep ${DEFAULT_IF}|awk '{split($4,a,"/"); print a[1]; exit}'`
+DEFAULT_IF_MTU=`ip a show ${DEFAULT_IF} | grep mtu | awk '{print $5}'`
 
 check_arguments $@
 mkdir -p ~/.osm