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 d5d5823bc..a8bab2c6e 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 4107ce9b4..d5a96425b 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 eac2dbd2f..46f48c99c 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 8c42d4256..900ea7fa8 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 c0ed52073..63d2ec9a7 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 6329af60e..089cf35e1 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 a7582d99e..b49a98e1a 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 82e2bf161..f7f7e2e5f 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 68395cd08..c5ac10a2c 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 %}