commit 4e404701e0efb012a15cc3859d99c6db6f689f23
author azvyagintsev <azvyagintsev@mirantis.com> Wed May 30 20:02:03 2018 +0300
committer Vasyl Saienko <vsaienko@mirantis.com> Fri Jun 01 22:07:31 2018 +0000
tree 5dc7df6e7e43e22ab59e05355eb1a65cd7c441f9
parent ff4efa535c738148200ad20304d7ed9a3af23f7e

Add remove_ntp_dhcp option

  * Those option are WA for
    https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=600661
    WA needed for extremly rare situatuon, when network dhcp provide wrong
    ntp.
  * Those option make sence to use only with dropping 'ntp-servers' request
    from dhclient.conf - unless, you totally remove dhcp client from system
  * Misc: update  run_tests.sh to latest

Change-Id: I8818eed3541f1d7bfc073cc05d8df48d124b812e

tests/pillar/client_auth.sls

diff --git a/tests/pillar/client_auth.sls b/tests/pillar/client_auth.sls
index ebe515e..6c5ca3f 100644
--- a/tests/pillar/client_auth.sls
+++ b/tests/pillar/client_auth.sls
@@ -1,6 +1,7 @@
 ntp:
   client:
     enabled: true
+    remove_dhcp_conf: true
     auth:
       enabled: true
       secrets:
@@ -22,4 +23,4 @@
         key_id: 1
       secondary:
         server: ntp.nic.cz
-        key_id: 2
\ No newline at end of file
+        key_id: 2

tests/pillar/server_auth.sls

diff --git a/tests/pillar/server_auth.sls b/tests/pillar/server_auth.sls
index 9c351c9..8891a40 100644
--- a/tests/pillar/server_auth.sls
+++ b/tests/pillar/server_auth.sls
@@ -15,6 +15,7 @@
           trustedkey: false
     mode7: true
     orphan: 5
+    remove_dhcp_conf: true
     peers:
     - host: 192.168.31.1
     - host: 192.168.31.2