Move lcm certificate to lcm folder in OSM helm chart

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

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index 7b0c48f..1e406dd 100755 (executable)
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -17,7 +17,7 @@
 
 LXD_VERSION=5.0
 JUJU_VERSION=2.9
-JUJU_AGENT_VERSION=2.9.34
+JUJU_AGENT_VERSION=2.9.43
 K8S_CLOUD_NAME="k8s-cloud"
 KUBECTL="microk8s.kubectl"
 MICROK8S_VERSION=1.26
@@ -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
@@ -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:
@@ -541,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