From 322e2de7d27c498a9d89b31b96729200bed56e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Wed, 27 Jun 2018 11:23:00 +0200 Subject: [PATCH] mon: honour mon_docker_net_host option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --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 --- roles/ceph-mon/templates/ceph-mon.service.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/ceph-mon/templates/ceph-mon.service.j2 b/roles/ceph-mon/templates/ceph-mon.service.j2 index 23b10fd58..b6ebf0ba1 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 }} \