From c919080fad9311b131fa696d1b9bcabf445af42f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 17 Dec 2019 08:58:58 -0600 Subject: [PATCH] cephadm: check for both ntp.service and ntpd.service Sigh... Signed-off-by: Sage Weil --- src/cephadm/cephadm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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': -- 2.47.3