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>

diff --git a/group_vars/osds.yml.sample b/group_vars/osds.yml.sample
index 937b4771bd290b55d842a43de91a406fd2376ec4..067673753e0f098d5c15929066d1f386c6848886 100644 (file)
--- a/group_vars/osds.yml.sample
+++ b/group_vars/osds.yml.sample
@@ -253,7 +253,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 ffef34956bfa2dbec53719f38733c48a2252e0f9..bee65ac0763656791bba1376bdcc8438269ccc45 100644 (file)
--- a/roles/ceph-osd/defaults/main.yml
+++ b/roles/ceph-osd/defaults/main.yml
@@ -245,7 +245,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 44a0c9e12e07b21f20ac9947752b54a44cb6cd9a..79779b354f40e0dffa0d4167bdb3d71a281fdb6f 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/{{ container_binary }} run \
   --rm \
   --net=host \