From: Sébastien Han Date: Wed, 1 Feb 2017 16:19:07 +0000 (+0100) Subject: docker: fix mkdir path for all the distros X-Git-Tag: v2.1.7~8 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d4cd0db7eeb1bdcdd2bed100aa784f7657075da;p=ceph-ansible.git docker: fix mkdir path for all the distros On ubntu systems mkdir is in /bin where on atomic it is /usr/bin/. We use the shell built-in function "command" to find its right location. Signed-off-by: Sébastien Han --- diff --git a/roles/ceph-mon/templates/ceph-mon.service.j2 b/roles/ceph-mon/templates/ceph-mon.service.j2 index a9f41a923..1815015c5 100644 --- a/roles/ceph-mon/templates/ceph-mon.service.j2 +++ b/roles/ceph-mon/templates/ceph-mon.service.j2 @@ -5,7 +5,7 @@ After=docker.service [Service] EnvironmentFile=-/etc/environment ExecStartPre=-/usr/bin/docker rm %i -ExecStartPre=/usr/bin/mkdir -p /etc/ceph /var/lib/ceph/mon +ExecStartPre=$(command -v mkdir) -p /etc/ceph /var/lib/ceph/mon ExecStart=/usr/bin/docker run --rm --name %i --net=host \ {% if not mon_containerized_deployment_with_kv -%} -v /var/lib/ceph:/var/lib/ceph \