Merge pull request #3884 from mtnbikenc/disable-swap

Merged by openshift-bot

2 files changed, 54 insertions, 0 deletions

diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index 626248306..59003bbf9 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -34,6 +34,33 @@
         dns_ip: "{{ openshift_dns_ip | default(none) | get_dns_ip(hostvars[inventory_hostname])}}"
         env_vars: "{{ openshift_node_env_vars | default(None) }}"
 
+# https://docs.openshift.com/container-platform/3.4/admin_guide/overcommit.html#disabling-swap-memory
+- name: Check for swap usage
+  command: grep "^[^#].*swap" /etc/fstab
+  # grep: match any lines which don't begin with '#' and contain 'swap'
+  # command: swapon --summary
+  # Alternate option, however if swap entries are in fstab, swap will be
+  # enabled at boot. Grepping fstab should catch a condition when swap was
+  # disabled, but the fstab entries were not removed.
+  changed_when: false
+  failed_when: false
+  register: swap_result
+
+  # Disable Swap Block
+- block:
+
+    - name: Disable swap
+      command: swapoff --all
+
+    - name: Remove swap entries from /etc/fstab
+      lineinfile:
+        dest: /etc/fstab
+        regexp: 'swap'
+        state: absent
+
+  when: swap_result.stdout_lines | length > 0
+  # End Disable Swap Block
+
 # We have to add tuned-profiles in the same transaction otherwise we run into depsolving
 # problems because the rpms don't pin the version properly. This was fixed in 3.1 packaging.
 - name: Install Node package
diff --git a/roles/openshift_node_upgrade/tasks/main.yml b/roles/openshift_node_upgrade/tasks/main.yml
index 6ae8dbc12..01bd3bf38 100644
--- a/roles/openshift_node_upgrade/tasks/main.yml
+++ b/roles/openshift_node_upgrade/tasks/main.yml
@@ -84,6 +84,33 @@
     value: "{{ oreg_url }}"
   when: oreg_url is defined
 
+# https://docs.openshift.com/container-platform/3.4/admin_guide/overcommit.html#disabling-swap-memory
+- name: Check for swap usage
+  command: grep "^[^#].*swap" /etc/fstab
+  # grep: match any lines which don't begin with '#' and contain 'swap'
+  # command: swapon --summary
+  # Alternate option, however if swap entries are in fstab, swap will be
+  # enabled at boot. Grepping fstab should catch a condition when swap was
+  # disabled, but the fstab entries were not removed.
+  changed_when: false
+  failed_when: false
+  register: swap_result
+
+  # Disable Swap Block
+- block:
+
+  - name: Disable swap
+    command: swapoff --all
+
+  - name: Remove swap entries from /etc/fstab
+    lineinfile:
+      dest: /etc/fstab
+      regexp: 'swap'
+      state: absent
+
+  when: swap_result.stdout_lines | length > 0
+  # End Disable Swap Block
+
 - name: Restart rpm node service
   service:
     name: "{{ openshift.common.service_type }}-node"