From 334d4cb885616ede72ceca6fcad95662040e1640 Mon Sep 17 00:00:00 2001
From: Konstantin Shalygin <k0ste@k0ste.ru>
Date: Sat, 8 Apr 2017 13:06:18 +0700
Subject: [PATCH] ceph-common: disable_transparent_hugepage now persist

---
 .../ceph-common/tasks/misc/system_tuning.yml  | 22 +++++++++++++++----
 .../templates/tmpfiles_hugepage.j2            |  3 +++
 2 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 roles/ceph-common/templates/tmpfiles_hugepage.j2

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' }}
-- 
2.47.3