From 3c025417d4b227187f7bc0d169dea417b2f5c73a Mon Sep 17 00:00:00 2001
From: Theo Chatzimichos <tampakrap@opensuse.org>
Date: Nov 09 2017 14:42:52 +0000
Subject: Merge branch 'tampakrap_ntp_ioo' into 'production'


NTP updates

See merge request infra/salt!75
---

diff --git a/pillar/common.sls b/pillar/common.sls
index 058a12c..9b34774 100644
--- a/pillar/common.sls
+++ b/pillar/common.sls
@@ -29,6 +29,9 @@ ntp:
           - -6 default kod notrap nomodify nopeer
           - 127.0.0.1
           - ::1
+          - ntp1.infra.opensuse.org
+          - ntp2.infra.opensuse.org
+          - ntp3.infra.opensuse.org
         trustedkey:
           - 1
 openldap:
diff --git a/pillar/id/anna_infra_opensuse_org.sls b/pillar/id/anna_infra_opensuse_org.sls
index f906b3b..1bb33d0 100644
--- a/pillar/id/anna_infra_opensuse_org.sls
+++ b/pillar/id/anna_infra_opensuse_org.sls
@@ -4,5 +4,6 @@ grains:
   roles:
     - proxy
     - proxy_master
+    - ntp
   salt_cluster: opensuse
   virt_cluster: atreju
diff --git a/pillar/id/elsa_infra_opensuse_org.sls b/pillar/id/elsa_infra_opensuse_org.sls
index 7a477c1..6098537 100644
--- a/pillar/id/elsa_infra_opensuse_org.sls
+++ b/pillar/id/elsa_infra_opensuse_org.sls
@@ -4,5 +4,6 @@ grains:
   roles:
     - proxy
     - proxy_slave
+    - ntp
   salt_cluster: opensuse
   virt_cluster: atreju
diff --git a/pillar/role/ntp.sls b/pillar/role/ntp.sls
index 3b585d3..86c4088 100644
--- a/pillar/role/ntp.sls
+++ b/pillar/role/ntp.sls
@@ -2,35 +2,15 @@ ntp:
   ng:
     settings:
       ntp_conf:
-        filegen:
-          - peerstats file peerstats type day enable
-          - loopstats file loopstats type day enable
-          - clockstats file clockstats type day enable
-        fudge:
-          - 127.127.1.0 stratum 10
+        peer:
+          - ntp1.infra.opensuse.org
+          - ntp2.infra.opensuse.org
+          - ntp3.infra.opensuse.org
         restrict:
-          - 130.149.17.21 nomodify notrap nopeer noquery
-          - 131.188.3.220 nomodify notrap nopeer noquery
-          - 131.188.3.221 nomodify notrap nopeer noquery
-          - 131.188.3.222 nomodify notrap nopeer noquery
-          - 213.95.151.123 nomodify notrap nopeer noquery
-          - 62.128.1.18 nomodify notrap nopeer noquery
-          - 129.143.2.23 nomodify notrap nopeer noquery
-          - 213.239.239.164 nomodify notrap nopeer noquery
-          - 10.0.0.0 mask 255.0.0.0 kod nomodify notrap nopeer
-          - '2620:0113:: mask ffff:ffff:: kod nomodify notrap nopeer'
-          - 149.44.0.0 mask 255.255.0.0 kod nomodify notrap nopeer noquery
-          - 149.44.176.0 mask 255.255.248.0 kod nomodify notrap nopeer
-          - 192.168.0.0 mask 255.255.255.0  kod nomodify notrap nopeer noquery
-          - 192.168.10.0 mask 255.255.255.0 kod nomodify notrap nopeer noquery
-          - 192.168.11.0 mask 255.255.255.0 kod nomodify notrap nopeer noquery
+          - ntp1.opensuse.org
+          - ntp2.opensuse.org
+          - 192.168.47.0 mask 255.255.255.0 kod nomodify notrap nopeer noquery
+          - 192.168.254.0 mask 255.255.255.0 kod nomodify notrap nopeer noquery
         server:
-          - 127.127.1.0
-          - 130.149.17.21 iburst
-          - 131.188.3.220 iburst prefer
-          - 131.188.3.221 iburst prefer
-          - 131.188.3.222 iburst prefer
-          - 213.95.151.123 iburst
-          - 62.128.1.18 iburst
-          - 129.143.2.23 iburst
-          - 213.239.239.164 iburst prefer
+          - ntp1.opensuse.org iburst prefer
+          - ntp2.opensuse.org iburst
diff --git a/pillar/role/ntp1.sls b/pillar/role/ntp1.sls
deleted file mode 100644
index 8bf0c24..0000000
--- a/pillar/role/ntp1.sls
+++ /dev/null
@@ -1,8 +0,0 @@
-ntp:
-  ng:
-    settings:
-      ntp_conf:
-        peer:
-          - 149.44.161.17
-        restrict:
-          - 149.44.161.17
diff --git a/pillar/role/ntp2.sls b/pillar/role/ntp2.sls
deleted file mode 100644
index 88282b5..0000000
--- a/pillar/role/ntp2.sls
+++ /dev/null
@@ -1,8 +0,0 @@
-ntp:
-  ng:
-    settings:
-      ntp_conf:
-        peer:
-          - 149.44.161.16
-        restrict:
-          - 149.44.161.16
diff --git a/pillar/salt_cluster/opensuse.sls b/pillar/salt_cluster/opensuse.sls
index b42e907..38cd45f 100644
--- a/pillar/salt_cluster/opensuse.sls
+++ b/pillar/salt_cluster/opensuse.sls
@@ -1,3 +1,13 @@
+{% if 'ntp' not in salt['grains.get']('roles' ,[]) %}
+ntp:
+  ng:
+    settings:
+      ntp_conf:
+        server:
+          - ntp1.infra.opensuse.org iburst
+          - ntp2.infra.opensuse.org iburst
+          - ntp3.infra.opensuse.org iburst
+{% endif %}
 salt:
   minion:
     master: minnie.infra.opensuse.org
diff --git a/pillar/salt_cluster/opensuse_or_suse_external.sls b/pillar/salt_cluster/opensuse_or_suse_external.sls
index f4a16e9..792d600 100644
--- a/pillar/salt_cluster/opensuse_or_suse_external.sls
+++ b/pillar/salt_cluster/opensuse_or_suse_external.sls
@@ -1,12 +1 @@
-{% if 'ntp' not in salt['grains.get']('roles' ,[]) %}
-ntp:
-  ng:
-    settings:
-      ntp_conf:
-        restrict:
-          - ntp1.infra.opensuse.org
-          - ntp2.infra.opensuse.org
-        server:
-          - ntp1.infra.opensuse.org iburst
-          - ntp2.infra.opensuse.org iburst
-{% endif %}
+#
diff --git a/pillar/virtual/kvm.sls b/pillar/virtual/kvm.sls
index 792d600..33996c7 100644
--- a/pillar/virtual/kvm.sls
+++ b/pillar/virtual/kvm.sls
@@ -1 +1,6 @@
-#
+ntp:
+  ng:
+    settings:
+      ntp_conf:
+        tinker:
+          - panic 0
diff --git a/salt/role/ntp1.sls b/salt/role/ntp1.sls
deleted file mode 100644
index 792d600..0000000
--- a/salt/role/ntp1.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/salt/role/ntp2.sls b/salt/role/ntp2.sls
deleted file mode 100644
index 792d600..0000000
--- a/salt/role/ntp2.sls
+++ /dev/null
@@ -1 +0,0 @@
-#