]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
nfs: fix systemd template service for ubuntu
authorGuillaume Abrioux <gabrioux@redhat.com>
Mon, 4 Mar 2019 16:45:51 +0000 (17:45 +0100)
committermergify[bot] <mergify[bot]@users.noreply.github.com>
Mon, 4 Mar 2019 19:54:25 +0000 (19:54 +0000)
`mkdir` is located in `/bin` on Ubuntu.
Let's use some jinja to support Ubuntu.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
roles/ceph-nfs/templates/ceph-nfs.service.j2

index 82cc61759e4c1c6be48eebabe1b8a4ac64deafec..1261e28bad140fc723f9666f00d76c8a1fd03582 100644 (file)
@@ -6,7 +6,7 @@ After=docker.service
 [Service]
 EnvironmentFile=-/etc/environment
 ExecStartPre=-/usr/bin/{{ container_binary }} rm ceph-nfs-%i
-ExecStartPre=/usr/bin/mkdir -p /etc/ceph /etc/ganesha /var/lib/nfs/ganesha
+ExecStartPre={{ '/bin/mkdir' if ansible_os_family == 'Debian' else '/usr/bin/mkdir' }} -p /etc/ceph /etc/ganesha /var/lib/nfs/ganesha
 ExecStart=/usr/bin/{{ container_binary }} run --rm --net=host \
   -v /var/lib/ceph:/var/lib/ceph:z \
   -v /etc/ceph:/etc/ceph:z \