From 09453e22f4336373067608ccd2b84ef9d90f73ff Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Mon, 22 Jun 2020 13:58:10 -0400 Subject: [PATCH] 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 (cherry picked from commit bd22f1d1ec8c692848aee5337cd0d682a3a058b7) --- roles/ceph-grafana/templates/grafana-server.service.j2 | 1 + roles/ceph-iscsi-gw/templates/rbd-target-api.service.j2 | 1 + roles/ceph-iscsi-gw/templates/rbd-target-gw.service.j2 | 1 + roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2 | 1 + roles/ceph-mds/templates/ceph-mds.service.j2 | 1 + roles/ceph-mgr/templates/ceph-mgr.service.j2 | 1 + roles/ceph-mon/templates/ceph-mon.service.j2 | 1 + roles/ceph-nfs/templates/ceph-nfs.service.j2 | 1 + roles/ceph-node-exporter/templates/node_exporter.service.j2 | 1 + roles/ceph-osd/templates/ceph-osd.service.j2 | 1 + roles/ceph-prometheus/templates/alertmanager.service.j2 | 1 + roles/ceph-prometheus/templates/prometheus.service.j2 | 1 + roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2 | 1 + roles/ceph-rgw/templates/ceph-radosgw.service.j2 | 1 + 14 files changed, 14 insertions(+) diff --git a/roles/ceph-grafana/templates/grafana-server.service.j2 b/roles/ceph-grafana/templates/grafana-server.service.j2 index 6a9814d01..2c2a765f7 100644 --- 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 9e685ba65..a8bbc76ef 100644 --- 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 87195754b..e17425708 100644 --- 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 9ddbed488..f43ec6482 100644 --- 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 e09f76638..518fed5e2 100644 --- 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 f02e21c0f..f26ad8d15 100644 --- 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 f2226d844..5b03b401b 100644 --- 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 f00ffaaf5..ebe478474 100644 --- 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 aacf93ec5..a41904b86 100644 --- 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 1f7bf2db6..088903234 100644 --- 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 2c787cb36..abd32bb77 100644 --- 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 c92e4d199..f3a4c516b 100644 --- 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 dcfca07e1..dd61082c7 100644 --- 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 d7bafd9b9..aa1fcf1d8 100644 --- 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 %} -- 2.39.5