Skip to content

Commit 9f04949

Browse files
guitsguits
committed
container: align systemd units with rpm
Update `After=` and `Wants=` parameters in container systemd units and make them be aligned with the systemd units that come from the packaging. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=2027440 Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com> (cherry picked from commit f01536e)
1 parent 7791fac commit 9f04949

File tree

15 files changed

+45
-30
lines changed

15 files changed

+45
-30
lines changed

‎roles/ceph-crash/templates/ceph-crash.service.j2

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
[Unit]
22
Description=Ceph crash dump collector
33
{% if container_binary == 'docker' %}
4-
After=docker.service
4+
After=docker.service network-online.target local-fs.target time-sync.target
55
Requires=docker.service
66
{% else %}
7-
After=network.target
7+
After=network-online.target local-fs.target time-sync.target
88
{% endif %}
9+
Wants=network-online.target local-fs.target time-sync.target
910

1011
[Service]
1112
{% if container_binary == 'podman' %}

‎roles/ceph-grafana/templates/grafana-server.service.j2

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
[Unit]
44
Description=grafana-server
55
{% if container_binary == 'docker' %}
6-
After=docker.service
6+
After=docker.service network-online.target local-fs.target time-sync.target
77
Requires=docker.service
88
{% else %}
9-
After=network.target
9+
After=network-online.target local-fs.target time-sync.target
1010
{% endif %}
11+
Wants=network-online.target local-fs.target time-sync.target
1112

1213
[Service]
1314
EnvironmentFile=-/etc/environment

‎roles/ceph-iscsi-gw/templates/rbd-target-api.service.j2

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
[Unit]
22
Description=RBD Target API Service
33
{% if container_binary == 'docker' %}
4-
After=docker.service
4+
After=docker.service network-online.target local-fs.target time-sync.target
55
Requires=docker.service
66
{% else %}
7-
After=network.target
7+
After=network-online.target local-fs.target time-sync.target
88
{% endif %}
9+
Wants=network-online.target local-fs.target time-sync.target
910

1011
[Service]
1112
EnvironmentFile=-/etc/environment

‎roles/ceph-iscsi-gw/templates/rbd-target-gw.service.j2

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
[Unit]
22
Description=RBD Target Gateway Service
33
{% if container_binary == 'docker' %}
4-
After=docker.service
4+
After=docker.service network-online.target local-fs.target time-sync.target
55
Requires=docker.service
66
{% else %}
7-
After=network.target
7+
After=network-online.target local-fs.target time-sync.target
88
{% endif %}
9+
Wants=network-online.target local-fs.target time-sync.target
910

1011
[Service]
1112
EnvironmentFile=-/etc/environment

‎roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
[Unit]
22
Description=TCMU Runner
33
{% if container_binary == 'docker' %}
4-
After=docker.service
4+
After=docker.service network-online.target local-fs.target time-sync.target
55
Requires=docker.service
66
{% else %}
7-
After=network.target
7+
After=network-online.target local-fs.target time-sync.target
88
{% endif %}
9+
Wants=network-online.target local-fs.target time-sync.target
910

1011
[Service]
1112
EnvironmentFile=-/etc/environment

‎roles/ceph-mds/templates/ceph-mds.service.j2

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
Description=Ceph MDS
33
PartOf=ceph-mds.target
44
{% if container_binary == 'docker' %}
5-
After=docker.service
5+
After=docker.service network-online.target local-fs.target time-sync.target
66
Requires=docker.service
77
{% else %}
8-
After=network.target
8+
After=network-online.target local-fs.target time-sync.target
99
{% endif %}
10+
Wants=network-online.target local-fs.target time-sync.target
1011
{% set cpu_limit = ansible_facts['processor_vcpus']|int if ceph_mds_docker_cpu_limit|int > ansible_facts['processor_vcpus']|int else ceph_mds_docker_cpu_limit|int %}
1112

1213
[Service]

‎roles/ceph-mgr/templates/ceph-mgr.service.j2

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
Description=Ceph Manager
33
PartOf=ceph-mgr.target
44
{% if container_binary == 'docker' %}
5-
After=docker.service
5+
After=docker.service network-online.target local-fs.target time-sync.target
66
Requires=docker.service
77
{% else %}
8-
After=network.target
8+
After=network-online.target local-fs.target time-sync.target
99
{% endif %}
10+
Wants=network-online.target local-fs.target time-sync.target
1011

1112
[Service]
1213
EnvironmentFile=-/etc/environment

‎roles/ceph-mon/templates/ceph-mon.service.j2

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
Description=Ceph Monitor
33
PartOf=ceph-mon.target
44
{% if container_binary == 'docker' %}
5-
After=docker.service
5+
After=docker.service network-online.target local-fs.target time-sync.target
66
Requires=docker.service
77
{% else %}
8-
After=network.target
8+
After=network-online.target local-fs.target time-sync.target
99
{% endif %}
10+
Wants=network-online.target local-fs.target time-sync.target
1011

1112
[Service]
1213
EnvironmentFile=-/etc/environment

‎roles/ceph-nfs/templates/ceph-nfs.service.j2

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
Description=NFS-Ganesha file server
33
Documentation=http://github.com/nfs-ganesha/nfs-ganesha/wiki
44
{% if container_binary == 'docker' %}
5-
After=docker.service
5+
After=docker.service network-online.target local-fs.target time-sync.target
66
Requires=docker.service
77
{% else %}
8-
After=network.target
8+
After=network-online.target local-fs.target time-sync.target
99
{% endif %}
10+
Wants=network-online.target local-fs.target time-sync.target
1011

1112
[Service]
1213
EnvironmentFile=-/etc/environment

‎roles/ceph-node-exporter/templates/node_exporter.service.j2

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
[Unit]
44
Description=Node Exporter
55
{% if container_binary == 'docker' %}
6-
After=docker.service
6+
After=docker.service network-online.target local-fs.target time-sync.target
77
Requires=docker.service
88
{% else %}
9-
After=network.target
9+
After=network-online.target local-fs.target time-sync.target
1010
{% endif %}
11+
Wants=network-online.target local-fs.target time-sync.target
1112

1213
[Service]
1314
EnvironmentFile=-/etc/environment

‎roles/ceph-osd/templates/ceph-osd.service.j2

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
Description=Ceph OSD
44
PartOf=ceph-osd.target
55
{% if container_binary == 'docker' %}
6-
After=docker.service
6+
After=docker.service network-online.target local-fs.target time-sync.target
77
Requires=docker.service
88
{% else %}
9-
After=network.target
9+
After=network-online.target local-fs.target time-sync.target
1010
{% endif %}
11+
Wants=network-online.target local-fs.target time-sync.target
1112
{% set cpu_limit = ansible_facts['processor_vcpus']|int if ceph_osd_docker_cpu_limit|int > ansible_facts['processor_vcpus']|int else ceph_osd_docker_cpu_limit|int %}
1213

1314
[Service]

‎roles/ceph-prometheus/templates/alertmanager.service.j2

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
[Unit]
44
Description=alertmanager
55
{% if container_binary == 'docker' %}
6-
After=docker.service
6+
After=docker.service network-online.target local-fs.target time-sync.target
77
Requires=docker.service
88
{% else %}
9-
After=network.target
9+
After=network-online.target local-fs.target time-sync.target
1010
{% endif %}
11+
Wants=network-online.target local-fs.target time-sync.target
1112

1213
[Service]
1314
WorkingDirectory={{ alertmanager_data_dir }}

‎roles/ceph-prometheus/templates/prometheus.service.j2

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
[Unit]
44
Description=prometheus
55
{% if container_binary == 'docker' %}
6-
After=docker.service
6+
After=docker.service network-online.target local-fs.target time-sync.target
77
Requires=docker.service
88
{% else %}
9-
After=network.target
9+
After=network-online.target local-fs.target time-sync.target
1010
{% endif %}
11+
Wants=network-online.target local-fs.target time-sync.target
1112

1213
[Service]
1314
EnvironmentFile=-/etc/environment

‎roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
Description=Ceph RBD mirror
33
PartOf=ceph-rbd-mirror.target
44
{% if container_binary == 'docker' %}
5-
After=docker.service
5+
After=docker.service network-online.target local-fs.target time-sync.target
66
Requires=docker.service
77
{% else %}
8-
After=network.target
8+
After=network-online.target local-fs.target time-sync.target
99
{% endif %}
10+
Wants=network-online.target local-fs.target time-sync.target
1011

1112
[Service]
1213
EnvironmentFile=-/etc/environment

‎roles/ceph-rgw/templates/ceph-radosgw.service.j2

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
Description=Ceph RGW
33
PartOf=ceph-radosgw.target
44
{% if container_binary == 'docker' %}
5-
After=docker.service
5+
After=docker.service network-online.target local-fs.target time-sync.target
66
Requires=docker.service
77
{% else %}
8-
After=network.target
8+
After=network-online.target local-fs.target time-sync.target
99
{% endif %}
10+
Wants=network-online.target local-fs.target time-sync.target
1011
{% set cpu_limit = ansible_facts['processor_vcpus']|int if ceph_rgw_docker_cpu_limit|int > ansible_facts['processor_vcpus']|int else ceph_rgw_docker_cpu_limit|int %}
1112

1213
[Service]

0 commit comments

Comments
 (0)