From: Sébastien Han Date: Wed, 27 Jun 2018 09:23:00 +0000 (+0200) Subject: mon: honour mon_docker_net_host option X-Git-Tag: v3.0.37~8 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3700815e805d4a340f38fd25570715a83daf98fd;p=ceph-ansible.git mon: honour mon_docker_net_host option --net=host was hardcoded in the startup line so even though mon_docker_net_host was set to False the net option would always be activated. mon_docker_net_host is set to True by default so this commit does not change the behaviour. Signed-off-by: Sébastien Han (cherry picked from commit 322e2de7d27c498a9d89b31b96729200bed56e19) --- diff --git a/roles/ceph-mon/templates/ceph-mon.service.j2 b/roles/ceph-mon/templates/ceph-mon.service.j2 index 9fe9d6774..47e97f6e1 100644 --- a/roles/ceph-mon/templates/ceph-mon.service.j2 +++ b/roles/ceph-mon/templates/ceph-mon.service.j2 @@ -6,7 +6,7 @@ After=docker.service EnvironmentFile=-/etc/environment ExecStartPre=-/usr/bin/docker rm ceph-mon-%i ExecStartPre=$(command -v mkdir) -p /etc/ceph /var/lib/ceph/mon -ExecStart=/usr/bin/docker run --rm --name ceph-mon-%i --net=host \ +ExecStart=/usr/bin/docker run --rm --name ceph-mon-%i \ --memory={{ ceph_mon_docker_memory_limit }} \ {% if ceph_docker_version.split('.')[0] | version_compare('13', '>=') -%} --cpus={{ ceph_mon_docker_cpu_limit }} \