patches/0009-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch

   1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
   2 From: Thomas Lamprecht <t.lamprecht@proxmox.com>
   3 Date: Thu, 26 Nov 2020 18:09:42 +0000
   4 Subject: [PATCH] fix service ordering, avoid Before=remote-fs-pre.target
   5
   6 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
   7 ---
   8  systemd/ceph-mds@.service.in     | 4 ++--
   9  systemd/ceph-mgr@.service.in     | 4 ++--
  10  systemd/ceph-mon@.service.in     | 4 ++--
  11  systemd/ceph-osd@.service.in     | 4 ++--
  12  systemd/ceph-radosgw@.service.in | 4 ++--
  13  systemd/rbdmap.service.in        | 3 +--
  14  6 files changed, 11 insertions(+), 12 deletions(-)
  15
  16 diff --git a/systemd/ceph-mds@.service.in b/systemd/ceph-mds@.service.in
  17 index e47738a27..eeab101b5 100644
  18 --- a/systemd/ceph-mds@.service.in
  19 +++ b/systemd/ceph-mds@.service.in
  20 @@ -2,8 +2,8 @@
  21  Description=Ceph metadata server daemon
  22  PartOf=ceph-mds.target
  23  After=network-online.target local-fs.target time-sync.target
  24 -Before=remote-fs-pre.target ceph-mds.target
  25 -Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-mds.target
  26 +Before=ceph-mds.target
  27 +Wants=network-online.target local-fs.target time-sync.target ceph-mds.target
  28
  29  [Service]
  30  LimitNOFILE=1048576
  31 diff --git a/systemd/ceph-mgr@.service.in b/systemd/ceph-mgr@.service.in
  32 index 0ff9db237..aea3af40a 100644
  33 --- a/systemd/ceph-mgr@.service.in
  34 +++ b/systemd/ceph-mgr@.service.in
  35 @@ -2,8 +2,8 @@
  36  Description=Ceph cluster manager daemon
  37  PartOf=ceph-mgr.target
  38  After=network-online.target local-fs.target time-sync.target
  39 -Before=remote-fs-pre.target ceph-mgr.target
  40 -Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-mgr.target
  41 +Before=ceph-mgr.target
  42 +Wants=network-online.target local-fs.target time-sync.target ceph-mgr.target
  43
  44  [Service]
  45  LimitNOFILE=1048576
  46 diff --git a/systemd/ceph-mon@.service.in b/systemd/ceph-mon@.service.in
  47 index d3121d59d..7992d502a 100644
  48 --- a/systemd/ceph-mon@.service.in
  49 +++ b/systemd/ceph-mon@.service.in
  50 @@ -6,8 +6,8 @@ PartOf=ceph-mon.target
  51  # these can be removed once ceph-mon will dynamically change network
  52  # configuration.
  53  After=network-online.target local-fs.target time-sync.target
  54 -Before=remote-fs-pre.target ceph-mon.target
  55 -Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-mon.target
  56 +Before=ceph-mon.target
  57 +Wants=network-online.target local-fs.target time-sync.target ceph-mon.target
  58
  59  [Service]
  60  LimitNOFILE=1048576
  61 diff --git a/systemd/ceph-osd@.service.in b/systemd/ceph-osd@.service.in
  62 index 2e5ea6ae4..987656da7 100644
  63 --- a/systemd/ceph-osd@.service.in
  64 +++ b/systemd/ceph-osd@.service.in
  65 @@ -2,8 +2,8 @@
  66  Description=Ceph object storage daemon osd.%i
  67  PartOf=ceph-osd.target
  68  After=network-online.target local-fs.target time-sync.target
  69 -Before=remote-fs-pre.target ceph-osd.target
  70 -Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-osd.target
  71 +Before=ceph-osd.target
  72 +Wants=network-online.target local-fs.target time-sync.target ceph-osd.target
  73
  74  [Service]
  75  LimitNOFILE=1048576
  76 diff --git a/systemd/ceph-radosgw@.service.in b/systemd/ceph-radosgw@.service.in
  77 index dee501b47..d1bcf5bb7 100644
  78 --- a/systemd/ceph-radosgw@.service.in
  79 +++ b/systemd/ceph-radosgw@.service.in
  80 @@ -2,8 +2,8 @@
  81  Description=Ceph rados gateway
  82  PartOf=ceph-radosgw.target
  83  After=network-online.target local-fs.target time-sync.target
  84 -Before=remote-fs-pre.target ceph-radosgw.target
  85 -Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-radosgw.target
  86 +Before=ceph-radosgw.target
  87 +Wants=network-online.target local-fs.target time-sync.target ceph-radosgw.target
  88
  89  [Service]
  90  LimitNOFILE=1048576
  91 diff --git a/systemd/rbdmap.service.in b/systemd/rbdmap.service.in
  92 index 6644508cf..96f7d54e7 100644
  93 --- a/systemd/rbdmap.service.in
  94 +++ b/systemd/rbdmap.service.in
  95 @@ -1,8 +1,7 @@
  96  [Unit]
  97  Description=Map RBD devices
  98  After=network-online.target ceph.target
  99 -Before=remote-fs-pre.target
 100 -Wants=network-online.target remote-fs-pre.target ceph.target
 101 +Wants=network-online.target ceph.target
 102
 103  [Service]
 104  EnvironmentFile=-@SYSTEMD_ENV_FILE@