From 2da8094e9d6d369e5daa017e1b687b615ab94660 Mon Sep 17 00:00:00 2001
From: Theo Chatzimichos <tampakrap@opensuse.org>
Date: Mar 27 2017 10:59:36 +0000
Subject: create new pillar match for all the DMZ machines


move the /etc/ntp.conf server smt-internal.o. definition to that new
pillar to match all of the machines that are in the DMZ

---

diff --git a/pillar/salt_cluster/opensuse_or_suse_external.sls b/pillar/salt_cluster/opensuse_or_suse_external.sls
new file mode 100644
index 0000000..6fc6d42
--- /dev/null
+++ b/pillar/salt_cluster/opensuse_or_suse_external.sls
@@ -0,0 +1,8 @@
+ntp:
+  ng:
+    settings:
+      ntp_conf:
+        restrict:
+          - smt-internal.opensuse.org
+        server:
+          - smt-internal.opensuse.org
diff --git a/pillar/top.sls b/pillar/top.sls
index de02d9d..77ad41b 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -37,6 +37,9 @@ production:
   'osrelease:{{ osrelease }}':
     - match: grain
     - osrelease.{{ osrelease.replace('.', '_') }}
+  'salt_cluster:(opensuse|suse_external)':
+    - match: grain_pcre
+    - salt_cluster.opensuse_or_suse_external
   {% if salt_cluster == 'opensuse' %}
   'salt_cluster:{{ salt_cluster }}':
     - match: grain
diff --git a/pillar/virt_cluster/atreju.sls b/pillar/virt_cluster/atreju.sls
index 6fc6d42..792d600 100644
--- a/pillar/virt_cluster/atreju.sls
+++ b/pillar/virt_cluster/atreju.sls
@@ -1,8 +1 @@
-ntp:
-  ng:
-    settings:
-      ntp_conf:
-        restrict:
-          - smt-internal.opensuse.org
-        server:
-          - smt-internal.opensuse.org
+#