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 9e685ba65e115e49b6443530e053f985b36704ed..a8bbc76ef9266f0e4b3c5cf69bc9624527e81674 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 87195754be8442d1151f9aede81d0dddd0cb7035..e17425708bf52a39cf8b1e76b137014418a44b34 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 9ddbed488ce5e366cd2bc4d743976191ccf48822..f43ec648279c6b54aa270f3e710b34baa467809f 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 e09f76638cfac77013b2b59f6ccd2c39a1c23c2c..518fed5e2befe3b79e7350344c8c8f8a62bb896f 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 f02e21c0f4f758b7ef329e7e4ed872314571948d..f26ad8d150f977ff04d2668a843794ef3c757513 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 f2226d84448cbbb2a8990eff7202b512cd238f5c..5b03b401bb99cb2cffa95018a38f22f9eb2606bb 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 dcfca07e1f1b9c893d10769c2f25e2b0c58f3971..dd61082c772381cdeea433c9f47d4b306738264d 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 d7bafd9b9bbe7998f6b5f6743268a0fb1f478e8f..aa1fcf1d861a38a0f098054bbb6be8aaeaa340d1 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 %}