From 52ab430b43b4168de3acd7f2b0379be1004d8e78 Mon Sep 17 00:00:00 2001
From: Karol Babioch <kbabioch@suse.de>
Date: Nov 05 2019 13:47:37 +0000
Subject: Merge branch 'widehat-slimhat' into 'production'


Add {slimhat,widehat}.infra.opensuse.org into Salt control

See merge request infra/salt!260
---

diff --git a/pillar/country/de-qsc.sls b/pillar/country/de-qsc.sls
new file mode 100644
index 0000000..792d600
--- /dev/null
+++ b/pillar/country/de-qsc.sls
@@ -0,0 +1 @@
+#
diff --git a/pillar/id/slimhat_infra_opensuse_org.sls b/pillar/id/slimhat_infra_opensuse_org.sls
new file mode 100644
index 0000000..5953b0c
--- /dev/null
+++ b/pillar/id/slimhat_infra_opensuse_org.sls
@@ -0,0 +1,20 @@
+grains:
+  city: QSC-nuremberg
+  country: de-qsc
+  roles: []
+  hostusage:
+    - IPMI access
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: bare-metal
+
+  aliases: []
+  description: IPMI backdoor for widehat.infra.opensuse.org (Remote access)
+  documentation: []
+  responsible:
+    - kbabioch@suse.de
+    - mcaj@suse.cz
+    - rklein@suse.com
+  partners:
+    - widehat.infra.opensuse.org
+  weburls: []
diff --git a/pillar/id/widehat_infra_opensuse_org.sls b/pillar/id/widehat_infra_opensuse_org.sls
new file mode 100644
index 0000000..daaed37
--- /dev/null
+++ b/pillar/id/widehat_infra_opensuse_org.sls
@@ -0,0 +1,20 @@
+grains:
+  city: QSC-nuremberg
+  country: de-qsc
+  hostusage:
+    - rsync.o.o
+  roles: []
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: bare-metal
+
+  aliases: []
+  description: Externally hosted mirror distribution source (HTTP/rsync) for openSUSE packages
+  documentation: []
+  responsible:
+    - kbabioch@suse.de
+    - mcaj@suse.cz
+    - rklein@suse.com
+  partners:
+    - slimhat.infra.opensuse.org
+  weburls: []
diff --git a/pillar/valid_custom_grains.yaml b/pillar/valid_custom_grains.yaml
index 1fe9fa9..09e1c36 100644
--- a/pillar/valid_custom_grains.yaml
+++ b/pillar/valid_custom_grains.yaml
@@ -7,6 +7,12 @@ global:
     - unknown
   salt_cluster: opensuse
 localized:
+  de-qsc:
+    city: QSC-nuremberg
+    default_domain: infra.opensuse.org
+    default_virt_cluster: atreju
+    domains: infra.opensuse.org
+    virt_cluster: bare-metal
   de:
     city: nuremberg
     default_domain: infra.opensuse.org
diff --git a/pillar/virt_cluster/bare-metal.sls b/pillar/virt_cluster/bare-metal.sls
new file mode 100644
index 0000000..792d600
--- /dev/null
+++ b/pillar/virt_cluster/bare-metal.sls
@@ -0,0 +1 @@
+#
diff --git a/pillar/virt_cluster/bare-metal/kvm.sls b/pillar/virt_cluster/bare-metal/kvm.sls
new file mode 100644
index 0000000..792d600
--- /dev/null
+++ b/pillar/virt_cluster/bare-metal/kvm.sls
@@ -0,0 +1 @@
+#