remove ability to disable swap

Addressing issue #919.

diff --git a/group_vars/all.sample b/group_vars/all.sample
index 04ba5434b104f41d4fcf7fd3514a4e9d253d1155..d9732ab4c46d3c0b2e354c0779f5e9a4072fdfd2 100644 (file)
--- a/group_vars/all.sample
+++ b/group_vars/all.sample
@@ -320,7 +320,6 @@ dummy:
 #############
 
 #disable_transparent_hugepage: true
-#disable_swap: false
 #os_tuning_params:
 #  - { name: kernel.pid_max, value: 4194303 }
 #  - { name: fs.file-max, value: 26234859 }

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 9f15acf855981551d6b2fc32ed54d137b938b557..aefdd012b7abcff5ad5570e43414738a8b4b3fa4 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -312,7 +312,6 @@ ceph_conf_overrides: {}
 #############
 
 disable_transparent_hugepage: true
-disable_swap: false
 os_tuning_params:
   - { name: kernel.pid_max, value: 4194303 }
   - { name: fs.file-max, value: 26234859 }

diff --git a/roles/ceph-common/tasks/misc/system_tuning.yml b/roles/ceph-common/tasks/misc/system_tuning.yml
index b6ad5199537bb9da454675585617ea222b77f773..621770520fbc9a8d3ff2a289dccf4bafb58606e1 100644 (file)
--- a/roles/ceph-common/tasks/misc/system_tuning.yml
+++ b/roles/ceph-common/tasks/misc/system_tuning.yml
@@ -10,12 +10,6 @@
   failed_when: false
   when: disable_transparent_hugepage
 
-- name: disable swap
-  command: swapoff -a
-  changed_when: false
-  failed_when: false
-  when: disable_swap
-
 - name: get default vm.min_free_kbytes
   command: sysctl -b vm.min_free_kbytes
   changed_when: false