systemd/service: Set docker.service conditionally

We don't need to set After=docker.service when the container_binary
variable isn't set to docker.
It doesn't break anything currently but it could be confusing when
using podman.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>

diff --git a/roles/ceph-iscsi-gw/templates/rbd-target-api.service.j2 b/roles/ceph-iscsi-gw/templates/rbd-target-api.service.j2
index a47493d84e257b30b0f0f572d081ed1cd18f92cd..9b556f3911434b8fb49a499f2e1f9258844c8c43 100644 (file)
--- a/roles/ceph-iscsi-gw/templates/rbd-target-api.service.j2
+++ b/roles/ceph-iscsi-gw/templates/rbd-target-api.service.j2
@@ -1,6 +1,8 @@
 [Unit]
 Description=RBD Target API Service
+{% if container_binary == 'docker' %}
 After=docker.service
+{% endif %}
 
 [Service]
 EnvironmentFile=-/etc/environment

diff --git a/roles/ceph-iscsi-gw/templates/rbd-target-gw.service.j2 b/roles/ceph-iscsi-gw/templates/rbd-target-gw.service.j2
index e01317ab59e3b34533fbeb3d646d55dd87f2e377..a0866459326d55016245f13bb95934ad6a1351db 100644 (file)
--- a/roles/ceph-iscsi-gw/templates/rbd-target-gw.service.j2
+++ b/roles/ceph-iscsi-gw/templates/rbd-target-gw.service.j2
@@ -1,6 +1,8 @@
 [Unit]
 Description=RBD Target Gateway Service
+{% if container_binary == 'docker' %}
 After=docker.service
+{% endif %}
 
 [Service]
 EnvironmentFile=-/etc/environment

diff --git a/roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2 b/roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2
index 0963e0e011c126f019ac8ce045674c68e013c458..83a1aa58a94492ef2b882137557c2dbb8ce7f38e 100644 (file)
--- a/roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2
+++ b/roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2
@@ -1,6 +1,8 @@
 [Unit]
 Description=TCMU Runner
+{% if container_binary == 'docker' %}
 After=docker.service
+{% endif %}
 
 [Service]
 EnvironmentFile=-/etc/environment

diff --git a/roles/ceph-mds/templates/ceph-mds.service.j2 b/roles/ceph-mds/templates/ceph-mds.service.j2
index eeeebf5a5b89b77ba0d0c20ea45dded14669d90a..2349e2919403c09dbf91c2713e258442f9c4c149 100644 (file)
--- a/roles/ceph-mds/templates/ceph-mds.service.j2
+++ b/roles/ceph-mds/templates/ceph-mds.service.j2
@@ -1,6 +1,8 @@
 [Unit]
 Description=Ceph MDS
+{% if container_binary == 'docker' %}
 After=docker.service
+{% endif %}
 
 [Service]
 EnvironmentFile=-/etc/environment

diff --git a/roles/ceph-mgr/templates/ceph-mgr.service.j2 b/roles/ceph-mgr/templates/ceph-mgr.service.j2
index a8d4e1b3b3582c8fbc2b90a709cb472542ad7578..c198c55f271b33cd74b47344fbca4d87d8586d06 100644 (file)
--- a/roles/ceph-mgr/templates/ceph-mgr.service.j2
+++ b/roles/ceph-mgr/templates/ceph-mgr.service.j2
@@ -1,6 +1,8 @@
 [Unit]
 Description=Ceph Manager
+{% if container_binary == 'docker' %}
 After=docker.service
+{% endif %}
 
 [Service]
 EnvironmentFile=-/etc/environment

diff --git a/roles/ceph-mon/templates/ceph-mon.service.j2 b/roles/ceph-mon/templates/ceph-mon.service.j2
index 7a4d5990d42c50cd299ac9bae8d5e53c377a39a5..255b355cfa29830acaac7bc89076bb3d0c9c27fe 100644 (file)
--- a/roles/ceph-mon/templates/ceph-mon.service.j2
+++ b/roles/ceph-mon/templates/ceph-mon.service.j2
@@ -1,6 +1,8 @@
 [Unit]
 Description=Ceph Monitor
+{% if container_binary == 'docker' %}
 After=docker.service
+{% endif %}
 
 [Service]
 EnvironmentFile=-/etc/environment

diff --git a/roles/ceph-nfs/templates/ceph-nfs.service.j2 b/roles/ceph-nfs/templates/ceph-nfs.service.j2
index e215eb92f0385a29a93f83445b1b9409a152a58a..a22b472dcea234ec527cdd53108ba4b2fe4f10ce 100644 (file)
--- a/roles/ceph-nfs/templates/ceph-nfs.service.j2
+++ b/roles/ceph-nfs/templates/ceph-nfs.service.j2
@@ -1,7 +1,9 @@
 [Unit]
 Description=NFS-Ganesha file server
 Documentation=http://github.com/nfs-ganesha/nfs-ganesha/wiki
+{% if container_binary == 'docker' %}
 After=docker.service
+{% endif %}
 
 [Service]
 EnvironmentFile=-/etc/environment

diff --git a/roles/ceph-osd/templates/ceph-osd.service.j2 b/roles/ceph-osd/templates/ceph-osd.service.j2
index fc46baf11d966beb95660faef6b1141eb6b11dca..31e117c689019326b25f2fe815a495060e520118 100644 (file)
--- a/roles/ceph-osd/templates/ceph-osd.service.j2
+++ b/roles/ceph-osd/templates/ceph-osd.service.j2
@@ -1,7 +1,9 @@
 # {{ ansible_managed }}
 [Unit]
 Description=Ceph OSD
+{% if container_binary == 'docker' %}
 After=docker.service
+{% endif %}
 
 [Service]
 EnvironmentFile=-/etc/environment

diff --git a/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2 b/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2
index a0a90bb6abee66f6165057adb1357a9763623bee..48b94f911502d10deb9b83313a62edb31f346abd 100644 (file)
--- a/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2
+++ b/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2
@@ -1,6 +1,8 @@
 [Unit]
 Description=Ceph RBD mirror
+{% if container_binary == 'docker' %}
 After=docker.service
+{% endif %}
 
 [Service]
 EnvironmentFile=-/etc/environment

diff --git a/roles/ceph-rgw/templates/ceph-radosgw.service.j2 b/roles/ceph-rgw/templates/ceph-radosgw.service.j2
index 1af65ba8b3ea8c149425e886eb2b668b47cae97d..d25cf3e6bcaa10315e92f1f4bc81638e888131b5 100644 (file)
--- a/roles/ceph-rgw/templates/ceph-radosgw.service.j2
+++ b/roles/ceph-rgw/templates/ceph-radosgw.service.j2
@@ -1,6 +1,8 @@
 [Unit]
 Description=Ceph RGW
+{% if container_binary == 'docker' %}
 After=docker.service
+{% endif %}
 
 [Service]
 EnvironmentFile=/var/lib/ceph/radosgw/ceph-%i/EnvironmentFile