From 3cd1c082c2cc5428dec3233dd1292b0249bef9d5 Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Feb 09 2020 22:35:32 +0000
Subject: Merge branch 'cboltz-simplify-pillar' into 'production'


Get rid of empty pillar/* directories

See merge request infra/salt!333
---

diff --git a/pillar/country/de-qsc.sls b/pillar/country/de-qsc.sls
deleted file mode 100644
index 792d600..0000000
--- a/pillar/country/de-qsc.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/pillar/country/de.sls b/pillar/country/de.sls
deleted file mode 100644
index 792d600..0000000
--- a/pillar/country/de.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/pillar/country/us.sls b/pillar/country/us.sls
deleted file mode 100644
index 792d600..0000000
--- a/pillar/country/us.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/pillar/domain/infra_opensuse_org.sls b/pillar/domain/infra_opensuse_org.sls
deleted file mode 100644
index 792d600..0000000
--- a/pillar/domain/infra_opensuse_org.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/pillar/top.sls b/pillar/top.sls
index f9823f8..452826a 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -1,12 +1,8 @@
-{% from "macros.jinja" import valid_virt_cluster with context %}
-{% set country = salt['grains.get']('country') %}
-{% set domain = salt['grains.get']('domain') %}
 {% set id = salt['grains.get']('id') %}
 {% set osfullname = salt['grains.get']('osfullname') %}
 {% set osmajorrelease = salt['grains.get']('osmajorrelease') %}
 {% set roles = salt['grains.get']('roles', []) %}
 {% set salt_cluster = salt['grains.get']('salt_cluster') %}
-{% set virt_cluster = salt['grains.get']('virt_cluster') %}
 {% set virtual = salt['grains.get']('virtual') %}
 
 {{ saltenv }}:
@@ -18,25 +14,9 @@
     - ignore_missing: True
     - role.{{ role }}
   {% endfor %}
-  {% if virt_cluster in valid_virt_cluster() %}
-  'virt_cluster:{{ virt_cluster }}':
-    - match: grain
-    - virt_cluster.{{ virt_cluster }}
-  'G@virt_cluster:{{ virt_cluster }} and G@virtual:{{ virtual }}':
-    - match: compound
-    - virt_cluster.{{ virt_cluster }}.{{ virtual }}
-  {% endif %}
   'virtual:{{ virtual }}':
     - match: grain
     - virtual.{{ virtual }}
-  'country:{{ country }}':
-    - match: grain
-    - country.{{ country }}
-  {% if domain and domain == 'infra.opensuse.org' %}
-  'domain:{{ domain }}':
-    - match: grain
-    - domain.{{ domain.replace('.', '_') }}
-  {% endif %}
   'osfullname:{{ osfullname }}':
     - match: grain
     - osfullname.{{ osfullname }}
diff --git a/pillar/virt_cluster/atreju.sls b/pillar/virt_cluster/atreju.sls
deleted file mode 100644
index 792d600..0000000
--- a/pillar/virt_cluster/atreju.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/pillar/virt_cluster/atreju/kvm.sls b/pillar/virt_cluster/atreju/kvm.sls
deleted file mode 100644
index 792d600..0000000
--- a/pillar/virt_cluster/atreju/kvm.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/pillar/virt_cluster/bare-metal.sls b/pillar/virt_cluster/bare-metal.sls
deleted file mode 100644
index 792d600..0000000
--- a/pillar/virt_cluster/bare-metal.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/pillar/virt_cluster/bare-metal/kvm.sls b/pillar/virt_cluster/bare-metal/kvm.sls
deleted file mode 100644
index 792d600..0000000
--- a/pillar/virt_cluster/bare-metal/kvm.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/pillar/virt_cluster/bare-metal/physical.sls b/pillar/virt_cluster/bare-metal/physical.sls
deleted file mode 100644
index 792d600..0000000
--- a/pillar/virt_cluster/bare-metal/physical.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/pillar/virt_cluster/bryce.sls b/pillar/virt_cluster/bryce.sls
deleted file mode 100644
index 792d600..0000000
--- a/pillar/virt_cluster/bryce.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/pillar/virt_cluster/bryce/kvm.sls b/pillar/virt_cluster/bryce/kvm.sls
deleted file mode 100644
index 792d600..0000000
--- a/pillar/virt_cluster/bryce/kvm.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/pillar/virt_cluster/slimhat.sls b/pillar/virt_cluster/slimhat.sls
deleted file mode 100644
index 792d600..0000000
--- a/pillar/virt_cluster/slimhat.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/pillar/virt_cluster/slimhat/kvm.sls b/pillar/virt_cluster/slimhat/kvm.sls
deleted file mode 100644
index 792d600..0000000
--- a/pillar/virt_cluster/slimhat/kvm.sls
+++ /dev/null
@@ -1 +0,0 @@
-#