]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm.py: add timemaster to timesync services list 56308/head
authorFlorent Carli <florent.carli@rte-france.com>
Tue, 12 Mar 2024 17:31:16 +0000 (18:31 +0100)
committerAdam King <adking@redhat.com>
Wed, 7 Aug 2024 13:12:13 +0000 (09:12 -0400)
On debian/ubuntu, if you need PTP, it's possible to use the linuxptp package for time-synchonization.
In that case the systemd service is called timemaster and is a wrapper for chrony/ntpd/phc2sys/ptp4l.

Signed-off-by: Florent Carli <florent.carli@rte-france.com>
(cherry picked from commit 4ee1c761e50e3c3feed89ccc5c450ac96681b778)

Conflicts:
src/cephadm/cephadm.py

src/cephadm/cephadm

index 2addee773e345a7781baafcd8675966cf7e511ab..6cc05fe121136b2e527ac70fd0f04ca286288771 100755 (executable)
@@ -7529,6 +7529,7 @@ def check_time_sync(ctx, enabler=None):
         'ntp.service',  # 18.04 (at least)
         'ntpsec.service',  # 20.04 (at least) / buster
         'openntpd.service',  # ubuntu / debian
+        'timemaster.service',  # linuxptp on ubuntu/debian
     ]
     if not check_units(ctx, units, enabler):
         logger.warning('No time sync service is running; checked for %s' % units)