From: Dimitri Savineau <dsavinea@redhat.com>
Date: Mon, 25 Feb 2019 14:19:44 +0000 (-0500)
Subject: ceph-osd: Drop memory flag with bluestore
X-Git-Tag: v4.0.0rc1~81
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=dc1c0dcee21deefa359cae30d3a733a4348bfd2f;p=ceph-ansible.git

ceph-osd: Drop memory flag with bluestore

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
---

diff --git a/roles/ceph-osd/templates/ceph-osd-run.sh.j2 b/roles/ceph-osd/templates/ceph-osd-run.sh.j2
index 5678d62bf..20496634f 100644
--- a/roles/ceph-osd/templates/ceph-osd-run.sh.j2
+++ b/roles/ceph-osd/templates/ceph-osd-run.sh.j2
@@ -75,7 +75,9 @@ fi
   --net=host \
   --privileged=true \
   --pid=host \
+  {% if osd_objectstore == 'filestore' -%}
   --memory={{ ceph_osd_docker_memory_limit }} \
+  {% endif -%}
   {% if (container_binary == 'docker' and ceph_docker_version.split('.')[0] is version_compare('13', '>=')) or container_binary == 'podman' -%}
   --cpus={{ ceph_osd_docker_cpu_limit }} \
   {% else -%}