From 907d7166e6626e3637972d0593d1761473b310bc Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Fri, 13 Jan 2017 14:49:05 -0800 Subject: [PATCH] clock: handle different service names Restarting ntpd involves two different service names (thanks again, distro maintainers, much appreciated) Signed-off-by: Dan Mick --- teuthology/task/clock.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/teuthology/task/clock.py b/teuthology/task/clock.py index bbfedffba4..0af18495a4 100644 --- a/teuthology/task/clock.py +++ b/teuthology/task/clock.py @@ -38,9 +38,11 @@ def task(ctx, config): if l.startswith('server') ] os.remove(ntpconf) + # CentOS calls it ntpd, Xenial/Trusty are ntp. Thanks guys. args = [ - 'sudo', - 'service', 'ntp', 'stop', + 'sudo', 'service', 'ntp', 'stop', + run.Raw('||'), + 'sudo', 'service', 'ntpd', 'stop', run.Raw(';'), 'sudo', 'ntpdate', @@ -48,8 +50,9 @@ def task(ctx, config): args.extend(servers) args.extend([ run.Raw(';'), - 'sudo', - 'service', 'ntp', 'start', + 'sudo', 'service', 'ntp', 'start', + run.Raw('||'), + 'sudo', 'service', 'ntpd', 'start', run.Raw(';'), 'PATH=/usr/bin:/usr/sbin', 'ntpdc', '-p', -- 2.39.5