move system tuning to osd role

The changes from these tasks only apply to osd nodes so there is no
reason to have them in ceph-common.

Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml
index 090debdf582bb49c376bb548dcfcab58b50ec55b..79ae3b3069de08c6387dcfceec52a31958c6beca 100644 (file)
--- a/roles/ceph-common/tasks/main.yml
+++ b/roles/ceph-common/tasks/main.yml
@@ -19,13 +19,6 @@
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
-- name: include misc/system_tuning.yml
-  include: misc/system_tuning.yml
-  when:
-    - osd_group_name in group_names
-  # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
-  static: False
-
 - name: include installs/install_on_redhat.yml
   include: installs/install_on_redhat.yml
   when:

diff --git a/roles/ceph-common/tasks/misc/system_tuning.yml b/roles/ceph-common/tasks/misc/system_tuning.yml
deleted file mode 100644 (file)
index 7431b3c..0000000
--- a/roles/ceph-common/tasks/misc/system_tuning.yml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-- name: disable osd directory parsing by updatedb
-  command: updatedb -e /var/lib/ceph
-  changed_when: false
-  failed_when: false
-  when:
-    - ansible_os_family == "Debian"
-    - osd_objectstore == 'filestore'
-    - ansible_os_family == "Debian"
-
-- name: disable osd directory path in updatedb.conf
-  replace:
-    dest: /etc/updatedb.conf
-    regexp: '^(PRUNEPATHS(?!.*/var/lib/ceph).*)"$'
-    replace: '\1 /var/lib/ceph"'
-  failed_when: false
-  when:
-    - ansible_os_family == "Debian"
-    - osd_objectstore == 'filestore'
-    - ansible_os_family == "Debian"
-
-- 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
-  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
-  command: sysctl -b vm.min_free_kbytes
-  changed_when: false
-  failed_when: false
-  check_mode: no
-  register: default_vm_min_free_kbytes
-
-- name: set_fact vm_min_free_kbytes
-  set_fact:
-    vm_min_free_kbytes: "{{ 4194303 if ansible_memtotal_mb >= 49152 else default_vm_min_free_kbytes.stdout }}"
-
-- name: apply operating system tuning
-  sysctl:
-    name: "{{ item.name }}"
-    value: "{{ item.value }}"
-    state: present
-    sysctl_file: /etc/sysctl.d/ceph-tuning.conf
-    ignoreerrors: yes
-  with_items: "{{ os_tuning_params }}"

diff --git a/roles/ceph-common/templates/tmpfiles_hugepage.j2 b/roles/ceph-common/templates/tmpfiles_hugepage.j2
deleted file mode 100644 (file)
index 7dff2c3..0000000
--- a/roles/ceph-common/templates/tmpfiles_hugepage.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-{{ '# ' + ansible_managed }}
-
-{{ 'w /sys/kernel/mm/transparent_hugepage/enabled - - - - never' }}

diff --git a/roles/ceph-osd/tasks/main.yml b/roles/ceph-osd/tasks/main.yml
index ab91cdd5a24b959659dcf49c63136e69890f4cdf..2421a12c511287681bf30dc0242391b4b82aa306 100644 (file)
--- a/roles/ceph-osd/tasks/main.yml
+++ b/roles/ceph-osd/tasks/main.yml
@@ -8,6 +8,13 @@
 - name: include check_mandatory_vars.yml
   include: check_mandatory_vars.yml
 
+- name: include misc/system_tuning.yml
+  include: system_tuning.yml
+  when:
+    - osd_group_name in group_names
+  # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
+  static: False
+
 - name: include pre_requisite.yml
   include: pre_requisite.yml
   when:

diff --git a/roles/ceph-osd/tasks/system_tuning.yml b/roles/ceph-osd/tasks/system_tuning.yml
new file mode 100644 (file)
index 0000000..7431b3c
--- /dev/null
+++ b/roles/ceph-osd/tasks/system_tuning.yml
@@ -0,0 +1,63 @@
+---
+- name: disable osd directory parsing by updatedb
+  command: updatedb -e /var/lib/ceph
+  changed_when: false
+  failed_when: false
+  when:
+    - ansible_os_family == "Debian"
+    - osd_objectstore == 'filestore'
+    - ansible_os_family == "Debian"
+
+- name: disable osd directory path in updatedb.conf
+  replace:
+    dest: /etc/updatedb.conf
+    regexp: '^(PRUNEPATHS(?!.*/var/lib/ceph).*)"$'
+    replace: '\1 /var/lib/ceph"'
+  failed_when: false
+  when:
+    - ansible_os_family == "Debian"
+    - osd_objectstore == 'filestore'
+    - ansible_os_family == "Debian"
+
+- 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
+  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
+  command: sysctl -b vm.min_free_kbytes
+  changed_when: false
+  failed_when: false
+  check_mode: no
+  register: default_vm_min_free_kbytes
+
+- name: set_fact vm_min_free_kbytes
+  set_fact:
+    vm_min_free_kbytes: "{{ 4194303 if ansible_memtotal_mb >= 49152 else default_vm_min_free_kbytes.stdout }}"
+
+- name: apply operating system tuning
+  sysctl:
+    name: "{{ item.name }}"
+    value: "{{ item.value }}"
+    state: present
+    sysctl_file: /etc/sysctl.d/ceph-tuning.conf
+    ignoreerrors: yes
+  with_items: "{{ os_tuning_params }}"

diff --git a/roles/ceph-osd/templates/tmpfiles_hugepage.j2 b/roles/ceph-osd/templates/tmpfiles_hugepage.j2
new file mode 100644 (file)
index 0000000..7dff2c3
--- /dev/null
+++ b/roles/ceph-osd/templates/tmpfiles_hugepage.j2
@@ -0,0 +1,3 @@
+{{ '# ' + ansible_managed }}
+
+{{ 'w /sys/kernel/mm/transparent_hugepage/enabled - - - - never' }}