docker: Add Requires on docker service

When using docker container engine then the systemd unit scripts only
use a dependency on the docker daemon via the After parameter.
But if docker is restarted on a live system then the ceph systemd units
should wait for the docker daemon to be fully restarted.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1846830
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit bd22f1d1ec8c692848aee5337cd0d682a3a058b7)

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 2cc19231f4a05dff0fff83b42acca08a95e6ff67..e3753c76ace4e4ff1827ec1124f6c43f62e64268 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,7 @@
 [Unit]
 Description=RBD Target API Service
 After=docker.service
+Requires=docker.service
 
 [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 6729884989110033675a35aa474363e099ecd82d..a9ba58859d26fd03f90a297719e234881fab7b7e 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,7 @@
 [Unit]
 Description=RBD Target Gateway Service
 After=docker.service
+Requires=docker.service
 
 [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 bbaf58ee798bc63ff8d268963ed4b43235858684..56b0a21b7af2c62f653253f4728ed67d9c4c426c 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,7 @@
 [Unit]
 Description=TCMU Runner
 After=docker.service
+Requires=docker.service
 
 [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 281a7b020ddb257dc6b03d0968bc64723ad02360..5eee48cdebe0688ebef66404ed0af3ac27ff075b 100644 (file)
--- a/roles/ceph-mds/templates/ceph-mds.service.j2
+++ b/roles/ceph-mds/templates/ceph-mds.service.j2
@@ -1,6 +1,7 @@
 [Unit]
 Description=Ceph MDS
 After=docker.service
+Requires=docker.service
 {% set cpu_limit = ansible_processor_vcpus|int if ceph_mds_docker_cpu_limit|int > ansible_processor_vcpus|int else ceph_mds_docker_cpu_limit|int %}
 
 [Service]

diff --git a/roles/ceph-mgr/templates/ceph-mgr.service.j2 b/roles/ceph-mgr/templates/ceph-mgr.service.j2
index 766290e2567ee0674eae091eb5f70080bfaf6ed3..bb950953755b7ff09114589adfc9717118c94f72 100644 (file)
--- a/roles/ceph-mgr/templates/ceph-mgr.service.j2
+++ b/roles/ceph-mgr/templates/ceph-mgr.service.j2
@@ -1,6 +1,7 @@
 [Unit]
 Description=Ceph Manager
 After=docker.service
+Requires=docker.service
 
 [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 f0aebf2c03d84c1a58c3b13ec99f61cf6d191b9a..d8a0c675f1945ff0196262ca3d0b66ff17a2bdad 100644 (file)
--- a/roles/ceph-mon/templates/ceph-mon.service.j2
+++ b/roles/ceph-mon/templates/ceph-mon.service.j2
@@ -1,6 +1,7 @@
 [Unit]
 Description=Ceph Monitor
 After=docker.service
+Requires=docker.service
 
 [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 77acbee90135517197d06adf0a9d72d017088e11..faae3cde652f3dda98379296c9fc734628b9ca7e 100644 (file)
--- a/roles/ceph-nfs/templates/ceph-nfs.service.j2
+++ b/roles/ceph-nfs/templates/ceph-nfs.service.j2
@@ -2,6 +2,7 @@
 Description=NFS-Ganesha file server
 Documentation=http://github.com/nfs-ganesha/nfs-ganesha/wiki
 After=docker.service
+Requires=docker.service
 
 [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 8ac36ceabb847f669b763dce1a79a7201d9a158e..a1df06c1891a213fab78c7b874c3a977a5f67c9a 100644 (file)
--- a/roles/ceph-osd/templates/ceph-osd.service.j2
+++ b/roles/ceph-osd/templates/ceph-osd.service.j2
@@ -2,6 +2,7 @@
 [Unit]
 Description=Ceph OSD
 After=docker.service
+Requires=docker.service
 
 [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 cd853f77557f70d48cab086e7d82ed7bee736c45..d76ac06014b2127a668feb426b46864b83939c4e 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,7 @@
 [Unit]
 Description=Ceph RBD mirror
 After=docker.service
+Requires=docker.service
 
 [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 5c4366429629edcb4e46a353df61dafc572a7354..dc0776912ee5558ae6d0e796dfb727d760aa2dd9 100644 (file)
--- a/roles/ceph-rgw/templates/ceph-radosgw.service.j2
+++ b/roles/ceph-rgw/templates/ceph-radosgw.service.j2
@@ -1,6 +1,7 @@
 [Unit]
 Description=Ceph RGW
 After=docker.service
+Requires=docker.service
 {% set cpu_limit = ansible_processor_vcpus|int if ceph_rgw_docker_cpu_limit|int > ansible_processor_vcpus|int else ceph_rgw_docker_cpu_limit|int %}
 
 [Service]