ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ceph-osd: Fix merge conflict from mergify 

The PR #3916 was merged automatically by mergify even if there was a
confict in the ceph-osd-run.sh.j2 template.
This commit resolves the conflict.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
pull/3919/head
Dimitri Savineau 2019-04-24 12:31:18 -04:00 committed by Dimitri Savineau
parent 3ae2a687ed
commit 54128db5cd
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
roles/ceph-osd/templates/ceph-osd-run.sh.j2
View File

@ -84,13 +84,8 @@ numactl \
{% if osd_objectstore == 'filestore' -%}
--memory={{ ceph_osd_docker_memory_limit }} \
{% endif -%}
<<<<<<< HEAD
{% if ceph_docker_version.split('.')[0] is version_compare('13', '>=') -%}
--cpus={{ ceph_osd_docker_cpu_limit }} \
=======
{% if (container_binary == 'docker' and ceph_docker_version.split('.')[0] is version_compare('13', '>=')) or container_binary == 'podman' -%}
--cpus={{ cpu_limit }} \
>>>>>>> c1710687... ceph-osd: Increase cpu limit to 4
{% else -%}
--cpu-quota={{ cpu_limit * 100000 }} \
{% endif -%}