From df893f395e62c8b1db18a277b38b44cab8b2016f Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Thu, 7 Apr 2016 20:17:44 +0200 Subject: [PATCH 1/3] systemd: make Ceph daemon units "want" time-sync.target Fixes: http://tracker.ceph.com/issues/15419 Signed-off-by: Nathan Cutler --- systemd/ceph-mds@.service | 4 ++-- systemd/ceph-mon@.service | 4 ++-- systemd/ceph-osd@.service | 4 ++-- systemd/ceph-radosgw@.service | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/systemd/ceph-mds@.service b/systemd/ceph-mds@.service index ae1c29d68eb..d34bd057b76 100644 --- a/systemd/ceph-mds@.service +++ b/systemd/ceph-mds@.service @@ -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] diff --git a/systemd/ceph-mon@.service b/systemd/ceph-mon@.service index d62c4fd0193..15e2bf7c8b6 100644 --- a/systemd/ceph-mon@.service +++ b/systemd/ceph-mon@.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 diff --git a/systemd/ceph-osd@.service b/systemd/ceph-osd@.service index ac178e3b1c6..592b324a8f1 100644 --- a/systemd/ceph-osd@.service +++ b/systemd/ceph-osd@.service @@ -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] diff --git a/systemd/ceph-radosgw@.service b/systemd/ceph-radosgw@.service index e19ba1648c1..3f7fcaca351 100644 --- a/systemd/ceph-radosgw@.service +++ b/systemd/ceph-radosgw@.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] From f27cda03b7a961e445cce4ad35db6417e9e55959 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Thu, 7 Apr 2016 20:54:21 +0200 Subject: [PATCH 2/3] deb: make ceph-base and radosgw recommend time-daemon References: http://tracker.ceph.com/issues/15419 Signed-off-by: Nathan Cutler --- debian/control | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 3f0f5c2d472..8a3cd02a429 100644 --- a/debian/control +++ b/debian/control @@ -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 From 23108547454f53b95e193086d82d433570312ad4 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Sat, 23 Apr 2016 11:42:25 +0200 Subject: [PATCH 3/3] ceph.spec.in: recommend ntp-daemon on SUSE SUSE has settled on "ntp-daemon" as the generic package name. The "ntp" and "chrony" etc. packages have "Provides: ntp-daemon" in their respective spec files. References: http://tracker.ceph.com/issues/15419 Signed-off-by: Nathan Cutler --- ceph.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/ceph.spec.in b/ceph.spec.in index 26a29b8f5e1..18bd7a695d6 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -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