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

Merge pull request #1874 from ceph/rbd-mirror-mem 

ceph-rbd-mirror; docker fix typo
pull/1875/head
Sébastien Han 2017-09-08 17:50:55 +02:00 committed by GitHub
parent d53f55e807 7a93d88025
commit a05c58ba37
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2
View File

@ -7,11 +7,11 @@ EnvironmentFile=-/etc/environment
ExecStartPre=-/usr/bin/docker stop ceph-rbd-mirror-{{ ansible_hostname }}
ExecStartPre=-/usr/bin/docker rm ceph-rbd-mirror-{{ ansible_hostname }}
ExecStart=/usr/bin/docker run --rm --net=host \
--memory={{ ceph_rbd_mirorr_docker_memory_limit }} \
--memory={{ ceph_rbd_mirror_docker_memory_limit }} \
{% if docker_version.split('.')[0] | version_compare('13', '>=') -%}
--cpus={{ ceph_rbd_mirror_docker_cpu_limit }} \
{% else -%}
--cpu-quota={{ ceph_rbd_mirorr_docker_cpu_limit * 100000 }} \
--cpu-quota={{ ceph_rbd_mirror_docker_cpu_limit * 100000 }} \
{% endif -%}
{% if not containerized_deployment_with_kv -%}
-v /etc/ceph:/etc/ceph \