From 29566bc3bd6a9b11f391a4d3d38e6a622d12bd28 Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Mon, 6 Feb 2017 14:24:48 -0800 Subject: [PATCH] testnode/tasks/ntp: remove '/etc/network/if-up.d/ntpdate' on Xenial It's buggy (see comment in code) and we don't need it, because teuthology does what it would do anyway. Supposed to be fixed in a later version of the Debian package which is in Yakkety. Fixes: http://tracker.ceph.com/issues/18837 Signed-off-by: Dan Mick --- roles/testnode/tasks/ntp.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/roles/testnode/tasks/ntp.yml b/roles/testnode/tasks/ntp.yml index c5cd2b79..e0cf84dc 100644 --- a/roles/testnode/tasks/ntp.yml +++ b/roles/testnode/tasks/ntp.yml @@ -15,6 +15,16 @@ tags: - packages +# See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=806556. +# ifdown/ifup would often leave ntpd not running on xenial. +# We do our own ntpdate dance in teuthology's clock task. +- name: Remove racy /etc/network/if-up.d/ntpdate on xenial + file: + name: /etc/network/if-up.d/ntpdate + state: absent + when: ansible_distribution == "Ubuntu" and + ansible_distribution_major_version == '16' + - name: Create the ntp.conf file. template: src: ntp.conf -- 2.47.3