]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
ceph-osd: Drop memory flag with bluestore
authorDimitri Savineau <dsavinea@redhat.com>
Mon, 25 Feb 2019 14:19:44 +0000 (09:19 -0500)
committermergify[bot] <mergify[bot]@users.noreply.github.com>
Tue, 9 Apr 2019 13:26:20 +0000 (13:26 +0000)
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit dc1c0dcee21deefa359cae30d3a733a4348bfd2f)

roles/ceph-osd/templates/ceph-osd-run.sh.j2

index 4a6eaa1819caac5d30fefbf529ae488797d4b1c3..8772b876ef02a6efb2dc1a505ce56fedb96c30ed 100644 (file)
@@ -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 -%}