Commit bd22f1d1 authored by Dimitri Savineau's avatar Dimitri Savineau Committed by Guillaume Abrioux
Browse files

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: default avatarDimitri Savineau <dsavinea@redhat.com>
parent 37b20b65
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
Description=grafana-server Description=grafana-server
{% if container_binary == 'docker' %} {% if container_binary == 'docker' %}
After=docker.service After=docker.service
Requires=docker.service
{% else %} {% else %}
After=network.target After=network.target
{% endif %} {% endif %}
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
Description=RBD Target API Service Description=RBD Target API Service
{% if container_binary == 'docker' %} {% if container_binary == 'docker' %}
After=docker.service After=docker.service
Requires=docker.service
{% else %} {% else %}
After=network.target After=network.target
{% endif %} {% endif %}
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
Description=RBD Target Gateway Service Description=RBD Target Gateway Service
{% if container_binary == 'docker' %} {% if container_binary == 'docker' %}
After=docker.service After=docker.service
Requires=docker.service
{% else %} {% else %}
After=network.target After=network.target
{% endif %} {% endif %}
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
Description=TCMU Runner Description=TCMU Runner
{% if container_binary == 'docker' %} {% if container_binary == 'docker' %}
After=docker.service After=docker.service
Requires=docker.service
{% else %} {% else %}
After=network.target After=network.target
{% endif %} {% endif %}
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
Description=Ceph MDS Description=Ceph MDS
{% if container_binary == 'docker' %} {% if container_binary == 'docker' %}
After=docker.service After=docker.service
Requires=docker.service
{% else %} {% else %}
After=network.target After=network.target
{% endif %} {% endif %}
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
Description=Ceph Manager Description=Ceph Manager
{% if container_binary == 'docker' %} {% if container_binary == 'docker' %}
After=docker.service After=docker.service
Requires=docker.service
{% else %} {% else %}
After=network.target After=network.target
{% endif %} {% endif %}
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
Description=Ceph Monitor Description=Ceph Monitor
{% if container_binary == 'docker' %} {% if container_binary == 'docker' %}
After=docker.service After=docker.service
Requires=docker.service
{% else %} {% else %}
After=network.target After=network.target
{% endif %} {% endif %}
......
...@@ -3,6 +3,7 @@ Description=NFS-Ganesha file server ...@@ -3,6 +3,7 @@ Description=NFS-Ganesha file server
Documentation=http://github.com/nfs-ganesha/nfs-ganesha/wiki Documentation=http://github.com/nfs-ganesha/nfs-ganesha/wiki
{% if container_binary == 'docker' %} {% if container_binary == 'docker' %}
After=docker.service After=docker.service
Requires=docker.service
{% else %} {% else %}
After=network.target After=network.target
{% endif %} {% endif %}
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
Description=Node Exporter Description=Node Exporter
{% if container_binary == 'docker' %} {% if container_binary == 'docker' %}
After=docker.service After=docker.service
Requires=docker.service
{% else %} {% else %}
After=network.target After=network.target
{% endif %} {% endif %}
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
Description=Ceph OSD Description=Ceph OSD
{% if container_binary == 'docker' %} {% if container_binary == 'docker' %}
After=docker.service After=docker.service
Requires=docker.service
{% else %} {% else %}
After=network.target After=network.target
{% endif %} {% endif %}
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
Description=alertmanager Description=alertmanager
{% if container_binary == 'docker' %} {% if container_binary == 'docker' %}
After=docker.service After=docker.service
Requires=docker.service
{% else %} {% else %}
After=network.target After=network.target
{% endif %} {% endif %}
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
Description=prometheus Description=prometheus
{% if container_binary == 'docker' %} {% if container_binary == 'docker' %}
After=docker.service After=docker.service
Requires=docker.service
{% else %} {% else %}
After=network.target After=network.target
{% endif %} {% endif %}
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
Description=Ceph RBD mirror Description=Ceph RBD mirror
{% if container_binary == 'docker' %} {% if container_binary == 'docker' %}
After=docker.service After=docker.service
Requires=docker.service
{% else %} {% else %}
After=network.target After=network.target
{% endif %} {% endif %}
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
Description=Ceph RGW Description=Ceph RGW
{% if container_binary == 'docker' %} {% if container_binary == 'docker' %}
After=docker.service After=docker.service
Requires=docker.service
{% else %} {% else %}
After=network.target After=network.target
{% endif %} {% endif %}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment