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-grafana/templates/grafana-server.service.j2 b/roles/ceph-grafana/templates/grafana-server.service.j2
index 6a9814d0192a68a6e191882f0d6ae919c6cb668e..2c2a765f74f59b728bc5e9054d957f104fc20d2f 100644 (file)
--- a/roles/ceph-grafana/templates/grafana-server.service.j2
+++ b/roles/ceph-grafana/templates/grafana-server.service.j2
@@ -4,6 +4,7 @@
 Description=grafana-server
 {% if container_binary == 'docker' %}
 After=docker.service
+Requires=docker.service
 {% else %}
 After=network.target
 {% endif %}

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 d5d5823bc3a2a1b30ce9512eb6520365c6b5cebb..a8bab2c6e5a104b8df379ba10c206902f8464bf5 100644 (file)
--- a/roles/ceph-iscsi-gw/templates/rbd-target-api.service.j2
+++ b/roles/ceph-iscsi-gw/templates/rbd-target-api.service.j2
@@ -2,6 +2,7 @@
 Description=RBD Target API Service
 {% if container_binary == 'docker' %}
 After=docker.service
+Requires=docker.service
 {% else %}
 After=network.target
 {% endif %}

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 4107ce9b4cc902aa5a5dd20f31685e1b75fe76ca..d5a96425bdbb7062f9cbd3a223c3ad61b1a7a8ae 100644 (file)
--- a/roles/ceph-iscsi-gw/templates/rbd-target-gw.service.j2
+++ b/roles/ceph-iscsi-gw/templates/rbd-target-gw.service.j2
@@ -2,6 +2,7 @@
 Description=RBD Target Gateway Service
 {% if container_binary == 'docker' %}
 After=docker.service
+Requires=docker.service
 {% else %}
 After=network.target
 {% endif %}

diff --git a/roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2 b/roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2
index eac2dbd2f89fa7332d8541cfefae96a54409b3a9..46f48c99cce6246346437584286b9b33dc85ee4b 100644 (file)
--- a/roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2
+++ b/roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2
@@ -2,6 +2,7 @@
 Description=TCMU Runner
 {% if container_binary == 'docker' %}
 After=docker.service
+Requires=docker.service
 {% else %}
 After=network.target
 {% endif %}

diff --git a/roles/ceph-mds/templates/ceph-mds.service.j2 b/roles/ceph-mds/templates/ceph-mds.service.j2
index 8c42d42568ab76511384fcd902b1fbc269050079..900ea7fa808e0f665e87b4e5e84d60ecfbec140c 100644 (file)
--- a/roles/ceph-mds/templates/ceph-mds.service.j2
+++ b/roles/ceph-mds/templates/ceph-mds.service.j2
@@ -2,6 +2,7 @@
 Description=Ceph MDS
 {% if container_binary == 'docker' %}
 After=docker.service
+Requires=docker.service
 {% else %}
 After=network.target
 {% endif %}

diff --git a/roles/ceph-mgr/templates/ceph-mgr.service.j2 b/roles/ceph-mgr/templates/ceph-mgr.service.j2
index c0ed52073618ab84ef9fef2da2fdf600a58cdb34..63d2ec9a71ff60055488fe62f5de306201147653 100644 (file)
--- a/roles/ceph-mgr/templates/ceph-mgr.service.j2
+++ b/roles/ceph-mgr/templates/ceph-mgr.service.j2
@@ -2,6 +2,7 @@
 Description=Ceph Manager
 {% if container_binary == 'docker' %}
 After=docker.service
+Requires=docker.service
 {% else %}
 After=network.target
 {% endif %}

diff --git a/roles/ceph-mon/templates/ceph-mon.service.j2 b/roles/ceph-mon/templates/ceph-mon.service.j2
index 6329af60e29fc0da5acf29464ca4f459a527dcbf..089cf35e164a5efd89af0c980a68efa904533054 100644 (file)
--- a/roles/ceph-mon/templates/ceph-mon.service.j2
+++ b/roles/ceph-mon/templates/ceph-mon.service.j2
@@ -2,6 +2,7 @@
 Description=Ceph Monitor
 {% if container_binary == 'docker' %}
 After=docker.service
+Requires=docker.service
 {% else %}
 After=network.target
 {% endif %}

diff --git a/roles/ceph-nfs/templates/ceph-nfs.service.j2 b/roles/ceph-nfs/templates/ceph-nfs.service.j2
index f00ffaaf5bdf94947d1e5c7476c3a0240bed73e6..ebe4784745cfc40d99cf00f3149843a29b11ae96 100644 (file)
--- a/roles/ceph-nfs/templates/ceph-nfs.service.j2
+++ b/roles/ceph-nfs/templates/ceph-nfs.service.j2
@@ -3,6 +3,7 @@ Description=NFS-Ganesha file server
 Documentation=http://github.com/nfs-ganesha/nfs-ganesha/wiki
 {% if container_binary == 'docker' %}
 After=docker.service
+Requires=docker.service
 {% else %}
 After=network.target
 {% endif %}

diff --git a/roles/ceph-node-exporter/templates/node_exporter.service.j2 b/roles/ceph-node-exporter/templates/node_exporter.service.j2
index aacf93ec59f05bbab559c444b669a34747c59a57..a41904b86f1414d605dea23f708f8218121305a2 100644 (file)
--- a/roles/ceph-node-exporter/templates/node_exporter.service.j2
+++ b/roles/ceph-node-exporter/templates/node_exporter.service.j2
@@ -4,6 +4,7 @@
 Description=Node Exporter
 {% if container_binary == 'docker' %}
 After=docker.service
+Requires=docker.service
 {% else %}
 After=network.target
 {% endif %}

diff --git a/roles/ceph-osd/templates/ceph-osd.service.j2 b/roles/ceph-osd/templates/ceph-osd.service.j2
index 1f7bf2db60252231e22170b9d53062895344e108..088903234ef43729742fdb83c793c97ec76e6a26 100644 (file)
--- a/roles/ceph-osd/templates/ceph-osd.service.j2
+++ b/roles/ceph-osd/templates/ceph-osd.service.j2
@@ -3,6 +3,7 @@
 Description=Ceph OSD
 {% if container_binary == 'docker' %}
 After=docker.service
+Requires=docker.service
 {% else %}
 After=network.target
 {% endif %}

diff --git a/roles/ceph-prometheus/templates/alertmanager.service.j2 b/roles/ceph-prometheus/templates/alertmanager.service.j2
index 2c787cb36655849441aa2c0e29b5834c61faa0fc..abd32bb774dda283e925c319ddfc7f347af0ece6 100644 (file)
--- a/roles/ceph-prometheus/templates/alertmanager.service.j2
+++ b/roles/ceph-prometheus/templates/alertmanager.service.j2
@@ -4,6 +4,7 @@
 Description=alertmanager
 {% if container_binary == 'docker' %}
 After=docker.service
+Requires=docker.service
 {% else %}
 After=network.target
 {% endif %}

diff --git a/roles/ceph-prometheus/templates/prometheus.service.j2 b/roles/ceph-prometheus/templates/prometheus.service.j2
index c92e4d1998dfb8590472fa1a4c93ac75575ee16c..f3a4c516b289a1bf86b24d5ec3e2192a6aad8439 100644 (file)
--- a/roles/ceph-prometheus/templates/prometheus.service.j2
+++ b/roles/ceph-prometheus/templates/prometheus.service.j2
@@ -4,6 +4,7 @@
 Description=prometheus
 {% if container_binary == 'docker' %}
 After=docker.service
+Requires=docker.service
 {% else %}
 After=network.target
 {% endif %}

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 82e2bf1617c47f31386d67971941e79a73f4edc1..f7f7e2e5f5ce5b4ec32cd6c193b734d584e5aa14 100644 (file)
--- a/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2
+++ b/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2
@@ -2,6 +2,7 @@
 Description=Ceph RBD mirror
 {% if container_binary == 'docker' %}
 After=docker.service
+Requires=docker.service
 {% else %}
 After=network.target
 {% endif %}

diff --git a/roles/ceph-rgw/templates/ceph-radosgw.service.j2 b/roles/ceph-rgw/templates/ceph-radosgw.service.j2
index 68395cd0863f12d68471f6ff2c2d28188f391093..c5ac10a2cd8ceeb44608ec8b67daef5c756a5007 100644 (file)
--- a/roles/ceph-rgw/templates/ceph-radosgw.service.j2
+++ b/roles/ceph-rgw/templates/ceph-radosgw.service.j2
@@ -2,6 +2,7 @@
 Description=Ceph RGW
 {% if container_binary == 'docker' %}
 After=docker.service
+Requires=docker.service
 {% else %}
 After=network.target
 {% endif %}