task: mon_clock_skew_check: by default, use max skew from global config

If not defined, defaults to 0.05;  if 'max-skew' however is defined, it
must override whatever is on the config.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>

diff --git a/teuthology/task/mon_clock_skew_check.py b/teuthology/task/mon_clock_skew_check.py
index 1fb9cecac77b555de053ed37056dc5cc1c37e7a4..1ad400cad770dc213a4cb478a2bc8c0068112635 100644 (file)
--- a/teuthology/task/mon_clock_skew_check.py
+++ b/teuthology/task/mon_clock_skew_check.py
@@ -60,7 +60,14 @@ class ClockSkewCheck:
       self.config = dict()
 
     self.check_interval = float(self.config.get('interval', 30.0))
-    self.max_skew = float(self.config.get('max-skew', 0.05))
+
+    # config defined max-skew must have priority over globally defined
+    self.max_skew = float(
+        self.config.get('max-skew',
+          ctx.ceph.conf['global'].get('mon clock drift allowed', 0.05)
+          )
+        )
+
     self.expect_skew = self.config.get('expect-skew', False)
     self.never_fail = self.config.get('never-fail', False)
     self.at_least_once = self.config.get('at-least-once', True)