diff --git a/roles/ceph-grafana/templates/grafana-server.service.j2 b/roles/ceph-grafana/templates/grafana-server.service.j2 index 6a9814d019..2c2a765f74 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 9e685ba65e..a8bbc76ef9 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 87195754be..e17425708b 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 9ddbed488c..f43ec64827 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 e09f76638c..518fed5e2b 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 f02e21c0f4..f26ad8d150 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 f2226d8444..5b03b401bb 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 f00ffaaf5b..ebe4784745 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 aacf93ec59..a41904b86f 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 1f7bf2db60..088903234e 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 2c787cb366..abd32bb774 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 c92e4d1998..f3a4c516b2 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 dcfca07e1f..dd61082c77 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 d7bafd9b9b..aa1fcf1d86 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 %}