From: Florent Carli <florent.carli@rte-france.com>
Date: Tue, 12 Mar 2024 17:31:16 +0000 (+0100)
Subject: cephadm.py: add timemaster to timesync services list
X-Git-Tag: v17.2.8~216^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F56308%2Fhead;p=ceph.git

cephadm.py: add timemaster to timesync services list

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
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 2addee773e34..6cc05fe12113 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -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)