From efa0083f3c3f598b2d0fde5343beadc61469f1ff Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Mon, 25 Feb 2019 09:19:44 -0500 Subject: [PATCH] ceph-osd: Drop memory flag with bluestore Signed-off-by: Dimitri Savineau (cherry picked from commit dc1c0dcee21deefa359cae30d3a733a4348bfd2f) --- roles/ceph-osd/templates/ceph-osd-run.sh.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/ceph-osd/templates/ceph-osd-run.sh.j2 b/roles/ceph-osd/templates/ceph-osd-run.sh.j2 index 4a6eaa181..8772b876e 100644 --- a/roles/ceph-osd/templates/ceph-osd-run.sh.j2 +++ b/roles/ceph-osd/templates/ceph-osd-run.sh.j2 @@ -80,7 +80,9 @@ numactl \ --privileged=true \ --pid=host \ --ipc=host \ + {% if osd_objectstore == 'filestore' -%} --memory={{ ceph_osd_docker_memory_limit }} \ + {% endif -%} {% if ceph_docker_version.split('.')[0] is version_compare('13', '>=') -%} --cpus={{ ceph_osd_docker_cpu_limit }} \ {% else -%} -- 2.39.5