]> git.apps.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, 26 Feb 2019 07:27:06 +0000 (07:27 +0000)
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
roles/ceph-osd/templates/ceph-osd-run.sh.j2

index 5678d62bfad305da8ac56141be80af6271d219d2..20496634ff9aaff5d3fa097ccd9484fe8ec505ff 100644 (file)
@@ -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 -%}