diff options
author | Scott Dodson <sdodson@redhat.com> | 2018-01-24 22:04:24 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-24 22:04:24 -0500 |
commit | 302a49e0aaa737f5fe3ecebe807cefee28916a09 (patch) | |
tree | 0c923464f9e23cc6f7b8d95b4aab339deddcf415 /roles/openshift_node/tasks/main.yml | |
parent | 91d82a4acac88f7361bb9c82b9f94d2f53fb8c1e (diff) | |
parent | 8c722ed8f5d986e465b1e95f31faa2a733af4715 (diff) | |
download | openshift-302a49e0aaa737f5fe3ecebe807cefee28916a09.tar.gz openshift-302a49e0aaa737f5fe3ecebe807cefee28916a09.tar.bz2 openshift-302a49e0aaa737f5fe3ecebe807cefee28916a09.tar.xz openshift-302a49e0aaa737f5fe3ecebe807cefee28916a09.zip |
Merge pull request #6551 from mgugino-upstream-stage/swapoff
Create swapoff module
Diffstat (limited to 'roles/openshift_node/tasks/main.yml')
-rw-r--r-- | roles/openshift_node/tasks/main.yml | 32 |
1 files changed, 5 insertions, 27 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 754ecacaf..f56f24e12 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -14,33 +14,11 @@ #### Disable SWAP ##### # 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' - changed_when: false - failed_when: false - register: swap_result - -- when: - - swap_result.stdout_lines | length > 0 - - openshift_disable_swap | default(true) | bool - block: - - name: Disable swap - command: swapoff --all - - - name: Remove swap entries from /etc/fstab - replace: - dest: /etc/fstab - regexp: '(^[^#].*swap.*)' - replace: '# \1' - backup: yes - - - name: Add notice about disabling swap - lineinfile: - dest: /etc/fstab - line: '# OpenShift-Ansible Installer disabled swap per overcommit guidelines' - state: present -#### End Disable Swap Block #### +# swapoff is a custom module in lib_utils that comments out swap entries in +# /etc/fstab and runs swapoff -a, if necessary. +- name: Disable swap + swapoff: {} + when: openshift_disable_swap | default(true) | bool - name: include node installer include_tasks: install.yml |