From: Sage Weil <sage@redhat.com>
Date: Tue, 17 Dec 2019 14:58:58 +0000 (-0600)
Subject: cephadm: check for both ntp.service and ntpd.service
X-Git-Tag: v15.1.0~453^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c919080fad9311b131fa696d1b9bcabf445af42f;p=ceph.git

cephadm: check for both ntp.service and ntpd.service

Sigh...

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 9fea0b3add0..78ae408ef46 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1958,7 +1958,11 @@ def command_rm_cluster():
 ##################################
 
 def check_time_sync():
-    units = ['chronyd.service', 'systemd-timesyncd.service', 'ntpd.service']
+    units = [
+        'chronyd.service', 'systemd-timesyncd.service',
+        'ntpd.service', # el7 (at least)
+        'ntp.service',  # 18.04 (at least)
+    ]
     for u in units:
         (enabled, state) = check_unit(u)
         if enabled and state == 'running':