From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Thu, 26 Nov 2020 18:09:42 +0000 Subject: [PATCH] fix service ordering, avoid Before=remote-fs-pre.target Signed-off-by: Thomas Lamprecht --- systemd/ceph-mds@.service.in | 4 ++-- systemd/ceph-mgr@.service.in | 4 ++-- systemd/ceph-mon@.service.in | 4 ++-- systemd/ceph-osd@.service.in | 4 ++-- systemd/ceph-radosgw@.service.in | 4 ++-- systemd/rbdmap.service.in | 3 +-- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/systemd/ceph-mds@.service.in b/systemd/ceph-mds@.service.in index afa36702f9c..03ffbc1fa10 100644 --- a/systemd/ceph-mds@.service.in +++ b/systemd/ceph-mds@.service.in @@ -2,8 +2,8 @@ Description=Ceph metadata server daemon PartOf=ceph-mds.target After=network-online.target local-fs.target time-sync.target -Before=remote-fs-pre.target ceph-mds.target -Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-mds.target +Before=ceph-mds.target +Wants=network-online.target local-fs.target time-sync.target ceph-mds.target [Service] Environment=CLUSTER=ceph diff --git a/systemd/ceph-mgr@.service.in b/systemd/ceph-mgr@.service.in index 8fadc4746b3..79ea740a76c 100644 --- a/systemd/ceph-mgr@.service.in +++ b/systemd/ceph-mgr@.service.in @@ -2,8 +2,8 @@ Description=Ceph cluster manager daemon PartOf=ceph-mgr.target After=network-online.target local-fs.target time-sync.target -Before=remote-fs-pre.target ceph-mgr.target -Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-mgr.target +Before=ceph-mgr.target +Wants=network-online.target local-fs.target time-sync.target ceph-mgr.target [Service] Environment=CLUSTER=ceph diff --git a/systemd/ceph-mon@.service.in b/systemd/ceph-mon@.service.in index 2eba83c3cc9..a2a619d7f36 100644 --- a/systemd/ceph-mon@.service.in +++ b/systemd/ceph-mon@.service.in @@ -6,8 +6,8 @@ PartOf=ceph-mon.target # these can be removed once ceph-mon will dynamically change network # configuration. After=network-online.target local-fs.target time-sync.target -Before=remote-fs-pre.target ceph-mon.target -Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-mon.target +Before=ceph-mon.target +Wants=network-online.target local-fs.target time-sync.target ceph-mon.target [Service] Environment=CLUSTER=ceph diff --git a/systemd/ceph-osd@.service.in b/systemd/ceph-osd@.service.in index 046500efb66..c988cf34513 100644 --- a/systemd/ceph-osd@.service.in +++ b/systemd/ceph-osd@.service.in @@ -2,8 +2,8 @@ Description=Ceph object storage daemon osd.%i PartOf=ceph-osd.target After=network-online.target local-fs.target time-sync.target -Before=remote-fs-pre.target ceph-osd.target -Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-osd.target +Before=ceph-osd.target +Wants=network-online.target local-fs.target time-sync.target ceph-osd.target [Service] Environment=CLUSTER=ceph diff --git a/systemd/ceph-radosgw@.service.in b/systemd/ceph-radosgw@.service.in index b7474705506..5cccc21ee43 100644 --- a/systemd/ceph-radosgw@.service.in +++ b/systemd/ceph-radosgw@.service.in @@ -2,8 +2,8 @@ Description=Ceph rados gateway PartOf=ceph-radosgw.target After=network-online.target local-fs.target time-sync.target -Before=remote-fs-pre.target ceph-radosgw.target -Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-radosgw.target +Before=ceph-radosgw.target +Wants=network-online.target local-fs.target time-sync.target ceph-radosgw.target [Service] Environment=CLUSTER=ceph diff --git a/systemd/rbdmap.service.in b/systemd/rbdmap.service.in index 6644508cf0d..96f7d54e7c7 100644 --- a/systemd/rbdmap.service.in +++ b/systemd/rbdmap.service.in @@ -1,8 +1,7 @@ [Unit] Description=Map RBD devices After=network-online.target ceph.target -Before=remote-fs-pre.target -Wants=network-online.target remote-fs-pre.target ceph.target +Wants=network-online.target ceph.target [Service] EnvironmentFile=-@SYSTEMD_ENV_FILE@