mirror of
https://github.com/ceph/ceph
synced 2025-01-29 22:43:40 +00:00
Merge pull request #8489 from SUSE/wip-15419
systemd: make Ceph daemons dependent upon time-sync.target Reviewed-by: Tim Serong <tserong@suse.com> Reviewed-by: James Page <james.page@ubuntu.com> Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
This commit is contained in:
commit
68a3173420
@ -249,6 +249,7 @@ Requires: findutils
|
||||
Requires: which
|
||||
%if 0%{?suse_version}
|
||||
Requires: lsb-release
|
||||
Recommends: ntp-daemon
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
Requires: redhat-lsb-core
|
||||
|
4
debian/control
vendored
4
debian/control
vendored
@ -101,7 +101,8 @@ Recommends: btrfs-tools,
|
||||
ceph-mds (= ${binary:Version}),
|
||||
librados2 (= ${binary:Version}),
|
||||
libradosstriper1 (= ${binary:Version}),
|
||||
librbd1 (= ${binary:Version})
|
||||
librbd1 (= ${binary:Version}),
|
||||
ntp | time-daemon
|
||||
Replaces: ceph-common (<< 0.78-500), python-ceph (<< 0.92-1223),
|
||||
ceph-test (<< 0.94-1322), ceph (<< 10)
|
||||
Breaks: python-ceph (<< 0.92-1223), ceph-test (<< 0.94-1322),
|
||||
@ -600,6 +601,7 @@ Depends: ceph-common (= ${binary:Version}),
|
||||
librgw2 (= ${binary:Version}),
|
||||
${misc:Depends},
|
||||
${shlibs:Depends}
|
||||
Recommends: ntp | time-daemon
|
||||
Description: REST gateway for RADOS distributed object store
|
||||
RADOS is a distributed object store used by the Ceph distributed
|
||||
storage system. This package provides a REST gateway to the
|
||||
|
@ -1,7 +1,7 @@
|
||||
[Unit]
|
||||
Description=Ceph metadata server daemon
|
||||
After=network-online.target local-fs.target
|
||||
Wants=network-online.target local-fs.target
|
||||
After=network-online.target local-fs.target time-sync.target
|
||||
Wants=network-online.target local-fs.target time-sync.target
|
||||
PartOf=ceph-mds.target
|
||||
|
||||
[Service]
|
||||
|
@ -5,8 +5,8 @@ Description=Ceph cluster monitor daemon
|
||||
# http://www.freedesktop.org/wiki/Software/systemd/NetworkTarget
|
||||
# these can be removed once ceph-mon will dynamically change network
|
||||
# configuration.
|
||||
After=network-online.target local-fs.target ceph-create-keys@%i.service
|
||||
Wants=network-online.target local-fs.target ceph-create-keys@%i.service
|
||||
After=network-online.target local-fs.target time-sync.target ceph-create-keys@%i.service
|
||||
Wants=network-online.target local-fs.target time-sync.target ceph-create-keys@%i.service
|
||||
|
||||
PartOf=ceph-mon.target
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
[Unit]
|
||||
Description=Ceph object storage daemon
|
||||
After=network-online.target local-fs.target
|
||||
Wants=network-online.target local-fs.target
|
||||
After=network-online.target local-fs.target time-sync.target
|
||||
Wants=network-online.target local-fs.target time-sync.target
|
||||
PartOf=ceph-osd.target
|
||||
|
||||
[Service]
|
||||
|
@ -1,7 +1,7 @@
|
||||
[Unit]
|
||||
Description=Ceph rados gateway
|
||||
After=network-online.target local-fs.target
|
||||
Wants=network-online.target local-fs.target
|
||||
After=network-online.target local-fs.target time-sync.target
|
||||
Wants=network-online.target local-fs.target time-sync.target
|
||||
PartOf=ceph-radosgw.target
|
||||
|
||||
[Service]
|
||||
|
Loading…
Reference in New Issue
Block a user