From 5a3f6d931324be0b066bbcd826c7ced885771134 Mon Sep 17 00:00:00 2001
From: Theo Chatzimichos <tampakrap@opensuse.org>
Date: Mar 31 2017 14:29:45 +0000
Subject: Add pillar/osmajorrelease/* which will be used a lot in the near future


Move the pillar/osrelease/12_x_or_42_x.sls to
pillar/osmajorrelease/12_or_42.sls as it is a pillar that matches leap
and SLE12 machines, and with the new file this is more obvious

---

diff --git a/pillar/osmajorrelease/11.sls b/pillar/osmajorrelease/11.sls
new file mode 100644
index 0000000..792d600
--- /dev/null
+++ b/pillar/osmajorrelease/11.sls
@@ -0,0 +1 @@
+#
diff --git a/pillar/osmajorrelease/12.sls b/pillar/osmajorrelease/12.sls
new file mode 100644
index 0000000..792d600
--- /dev/null
+++ b/pillar/osmajorrelease/12.sls
@@ -0,0 +1 @@
+#
diff --git a/pillar/osmajorrelease/12_or_42.sls b/pillar/osmajorrelease/12_or_42.sls
new file mode 100644
index 0000000..41e1cf5
--- /dev/null
+++ b/pillar/osmajorrelease/12_or_42.sls
@@ -0,0 +1,5 @@
+zypper:
+  packages:
+    aaa_base-extras: {}
+    ca-certificates-mozilla: {}
+    tmux: {}
diff --git a/pillar/osmajorrelease/42.sls b/pillar/osmajorrelease/42.sls
new file mode 100644
index 0000000..792d600
--- /dev/null
+++ b/pillar/osmajorrelease/42.sls
@@ -0,0 +1 @@
+#
diff --git a/pillar/osrelease/12_x_or_42_x.sls b/pillar/osrelease/12_x_or_42_x.sls
deleted file mode 100644
index 41e1cf5..0000000
--- a/pillar/osrelease/12_x_or_42_x.sls
+++ /dev/null
@@ -1,5 +0,0 @@
-zypper:
-  packages:
-    aaa_base-extras: {}
-    ca-certificates-mozilla: {}
-    tmux: {}
diff --git a/pillar/top.sls b/pillar/top.sls
index 4e897c5..a01d4eb 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -1,6 +1,7 @@
 {% set country = salt['grains.get']('country') %}
 {% set domain = salt['grains.get']('domain') %}
 {% set id = salt['grains.get']('id') %}
+{% set osmajorrelease = salt['grains.get']('osmajorrelease') %}
 {% set osrelease = salt['grains.get']('osrelease') %}
 {% set roles = salt['grains.get']('roles', []) %}
 {% set salt_cluster = salt['grains.get']('salt_cluster') %}
@@ -34,13 +35,15 @@ production:
     - match: grain
     - domain.{{ domain.replace('.', '_') }}
   {% endif %}
+  'osmajorrelease:{{ osmajorrelease }}':
+    - match: grain
+    - osmajorrelease.{{ osmajorrelease }}
+  'osmajorrelease:(1|4)2':
+    - match: grain_pcre
+    - osmajorrelease.12_or_42
   'osrelease:{{ osrelease }}':
     - match: grain
     - osrelease.{{ osrelease.replace('.', '_') }}
-  # match all SLE12* and Leap versions
-  'osrelease:(1|4)2.*':
-    - match: grain_pcre
-    - osrelease.12_x_or_42_x
   'salt_cluster:(opensuse|suse_external)':
     - match: grain_pcre
     - salt_cluster.opensuse_or_suse_external