From 2d5ba73df999bb311b5974f910893243889ee0a7 Mon Sep 17 00:00:00 2001
From: Billy Tat <btat@suse.com>
Date: Tue, 26 May 2020 14:21:51 -0700
Subject: [PATCH] Remove swapaccounting requirement

---
 xml/cap_depl_install_caasp.xml | 35 ----------------------------------
 xml/cap_kube_requirements.xml  |  6 ------
 2 files changed, 41 deletions(-)

diff --git a/xml/cap_depl_install_caasp.xml b/xml/cap_depl_install_caasp.xml
index b5f49a40..8988b7f5 100644
--- a/xml/cap_depl_install_caasp.xml
+++ b/xml/cap_depl_install_caasp.xml
@@ -190,41 +190,6 @@
      <link xlink:href="https://documentation.suse.com/suse-caasp/4.1/single-html/caasp-deployment/#_transitioning_from_docker_to_cri_o"/>
     </para>
    </listitem>
-   <listitem>
-    <para>
-     Swapaccounting is enabled on all worker nodes. For each node:
-    </para>
-    <procedure>
-     <step>
-      <para>
-       SSH into the node.
-      </para>
-      <substeps>
-       <step>
-        <para>
-	 If the <command>ssh-agent</command> is running, run:
-	</para>
-<screen>&prompt.user;ssh <replaceable>sles</replaceable>@&lt;NODE_IP_ADDRESS></screen>
-       </step>
-       <step>
-        <para>
-       	 Without the <command>ssh-agent</command> running, run:
-	</para>
-<screen>&prompt.user;ssh <replaceable>sles</replaceable>@&lt;NODE_IP_ADDRESS> -i &lt;PATH_TO_YOUR_SSH_PRIVATE_KEY></screen>
-       </step>
-      </substeps>
-     </step>
-     <step>
-      <para>
-       Enable swapaccounting on the node.
-      </para>
-<screen>&prompt.user;grep "swapaccount=1" /etc/default/grub || sudo sed -i -r 's|^(GRUB_CMDLINE_LINUX_DEFAULT=)\"(.*.)\"|\1\"\2 swapaccount=1 \"|' /etc/default/grub
-&prompt.user;sudo grub2-mkconfig -o /boot/grub2/grub.cfg
-&prompt.user;sudo systemctl reboot
-</screen>
-     </step>
-    </procedure>
-   </listitem>
   </itemizedlist>
  </sect1>
 
diff --git a/xml/cap_kube_requirements.xml b/xml/cap_kube_requirements.xml
index 2e47ec9e..1e671a95 100644
--- a/xml/cap_kube_requirements.xml
+++ b/xml/cap_kube_requirements.xml
@@ -33,12 +33,6 @@
     <!-- para -->
     &kernel-prereq;
    </listitem>
-   <listitem>
-    <para>
-     If your &kube; nodes have swap, then kernel parameter
-     <literal>swapaccount=1</literal> is set
-    </para>
-   </listitem>
    <listitem>
     <para>
      <command>docker info</command> must not show <literal>aufs</literal> as