osd: support numactl options on OSD activate

This commit adds OSD containers activate with numactl support.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1684146
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit b3eb9206fada05df811602217d8770db854e0adf)

diff --git a/group_vars/osds.yml.sample b/group_vars/osds.yml.sample
index 02e8685839f0a8440d8494562152d5c69b9d6d42..236a2e2bee690fb83fc63e85d55483573572c719 100644 (file)
--- a/group_vars/osds.yml.sample
+++ b/group_vars/osds.yml.sample
@@ -258,7 +258,7 @@ dummy:
 #
 #ceph_osd_docker_extra_env:
 #ceph_osd_docker_run_script_path: "/usr/share" # script called by systemd to run the docker command
-
+#ceph_osd_numactl_opts: ""
 
 ###########
 # SYSTEMD #

diff --git a/roles/ceph-osd/defaults/main.yml b/roles/ceph-osd/defaults/main.yml
index 0292e69e3027cfc195297b136d0f13b18649be7f..0f85a15112ddbd279aaea347e5bab0f82b119ed0 100644 (file)
--- a/roles/ceph-osd/defaults/main.yml
+++ b/roles/ceph-osd/defaults/main.yml
@@ -250,7 +250,7 @@ ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }}
 #
 ceph_osd_docker_extra_env:
 ceph_osd_docker_run_script_path: "/usr/share" # script called by systemd to run the docker command
-
+ceph_osd_numactl_opts: ""
 
 ###########
 # SYSTEMD #

diff --git a/roles/ceph-osd/templates/ceph-osd-run.sh.j2 b/roles/ceph-osd/templates/ceph-osd-run.sh.j2
index 7e7cda05ea5f6a452dc18d01d2400cba8af86c09..4a6eaa1819caac5d30fefbf529ae488797d4b1c3 100644 (file)
--- a/roles/ceph-osd/templates/ceph-osd-run.sh.j2
+++ b/roles/ceph-osd/templates/ceph-osd-run.sh.j2
@@ -70,6 +70,10 @@ fi
 # MAIN #
 ########
 
+{% if ceph_osd_numactl_opts != "" %}
+numactl \
+{{ ceph_osd_numactl_opts }} \
+{% endif %}
 /usr/bin/docker run \
   --rm \
   --net=host \