From: beierlm <mark.beierl@canonical.com>
Date: Wed, 21 Apr 2021 13:12:13 +0000 (-0400)
Subject: Attempt to remove swap
X-Git-Tag: release-v10.0-start~24
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=f7eefb25d54e4f4481004760f95f3e819e783ef1;hp=9a51086452eaf7ee39c485246c7bcc4a4481efae;p=osm%2Fdevops.git

Attempt to remove swap

Attempts to persist the deactivation of swap across reboots.
Note: this can still be overridden by external mechanisms
such as cloud-init

Fixes Bug 1062

Change-Id: I4b78191da63a1528bfe56d2c3e9a33342b86af21
Signed-off-by: beierlm <mark.beierl@canonical.com>
---

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index ef3ee9cf..213db756 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -852,6 +852,7 @@ function install_kube() {
 #initializes kubernetes control plane
 function init_kubeadm() {
     sudo swapoff -a
+    sudo sed -i.bak '/.*none.*swap/s/^\(.*\)$/#\1/g' /etc/fstab
     sudo kubeadm init --config $1
     sleep 5
 }