From: Konstantin Shalygin <k0ste@k0ste.ru>
Date: Sat, 8 Apr 2017 06:06:18 +0000 (+0700)
Subject: ceph-common: disable_transparent_hugepage now persist
X-Git-Tag: v2.2.0~3^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1422%2Fhead;p=ceph-ansible.git

ceph-common: disable_transparent_hugepage now persist
---

diff --git a/roles/ceph-common/tasks/misc/system_tuning.yml b/roles/ceph-common/tasks/misc/system_tuning.yml
index 4ea82868b..9ae92732e 100644
--- a/roles/ceph-common/tasks/misc/system_tuning.yml
+++ b/roles/ceph-common/tasks/misc/system_tuning.yml
@@ -4,11 +4,25 @@
   changed_when: false
   failed_when: false
 
+- name: create tmpfiles.d directory
+  file:
+    path: "/etc/tmpfiles.d"
+    state: "directory"
+    owner: "root"
+    group: "root"
+    mode: "0755"
+  register: "tmpfiles_d"
+  when: disable_transparent_hugepage
+
 - name: disable transparent hugepage
-  shell: |
-    echo never > /sys/kernel/mm/transparent_hugepage/enabled
-  changed_when: false
-  failed_when: false
+  template:
+    src: "tmpfiles_hugepage.j2"
+    dest: "/etc/tmpfiles.d/ceph_transparent_hugepage.conf"
+    group: "root"
+    owner: "root"
+    mode: "0644"
+    force: "yes"
+    validate: "systemd-tmpfiles --create %s"
   when: disable_transparent_hugepage
 
 - name: get default vm.min_free_kbytes
diff --git a/roles/ceph-common/templates/tmpfiles_hugepage.j2 b/roles/ceph-common/templates/tmpfiles_hugepage.j2
new file mode 100644
index 000000000..7dff2c34b
--- /dev/null
+++ b/roles/ceph-common/templates/tmpfiles_hugepage.j2
@@ -0,0 +1,3 @@
+{{ '# ' + ansible_managed }}
+
+{{ 'w /sys/kernel/mm/transparent_hugepage/enabled - - - - never' }}