From 4f1b69a4e020293d07770e7b3c346f02aa123161 Mon Sep 17 00:00:00 2001
From: Lars Vogdt <lars@linux-schulserver.de>
Date: Feb 04 2020 11:34:55 +0000
Subject: - we have four external DNS servers: nue-ns1, nue-ns2, provo-ns and qsc-ns4 now

- added osc-collab2 for dimstar: https://progress.opensuse.org/issues/62927
- added riesling3 for wiki upgrade

---

diff --git a/pillar/id/nue-ns1_infra_opensuse_org.sls b/pillar/id/nue-ns1_infra_opensuse_org.sls
index 9a85639..b4e5f5f 100644
--- a/pillar/id/nue-ns1_infra_opensuse_org.sls
+++ b/pillar/id/nue-ns1_infra_opensuse_org.sls
@@ -2,17 +2,21 @@ grains:
   city: nuremberg
   country: de
   hostusage:
-    - ns1.o.o
+    - DNS
   roles: []
   reboot_safe: yes
   salt_cluster: opensuse
   virt_cluster: atreju
 
-  aliases: []
+  aliases:
+    - ns1.infra.opensuse.org
   description: Public DNS server for the opensuse.org domain (not reverse)
-  documentation: []
+  documentation:
+    - https://progress.opensuse.org/projects/opensuse-admin-wiki/wiki/DNS
   responsible:
     - lrupp
   partners:
     - nue-ns2.infra.opensuse.org
+    - qsc-ns4.infra.opensuse-org
+    - provo-ns.infra.opensuse.org
   weburls: []
diff --git a/pillar/id/nue-ns2_infra_opensuse_org.sls b/pillar/id/nue-ns2_infra_opensuse_org.sls
index 38e596f..53bc04a 100644
--- a/pillar/id/nue-ns2_infra_opensuse_org.sls
+++ b/pillar/id/nue-ns2_infra_opensuse_org.sls
@@ -2,17 +2,21 @@ grains:
   city: nuremberg
   country: de
   hostusage:
-    - ns2.o.o
+    - DNS
   roles: []
   reboot_safe: yes
   salt_cluster: opensuse
   virt_cluster: atreju
 
-  aliases: []
+  aliases:
+    - ns2.infra.opensuse.org
   description: Public DNS server for the opensuse.org domain (not reverse)
-  documentation: []
+  documentation:
+    - https://progress.opensuse.org/projects/opensuse-admin-wiki/wiki/DNS
   responsible:
     - lrupp
   partners: 
     - nue-ns1.infra.opensuse.org
+    - qsc-ns4.infra.opensuse-org
+    - provo-ns.infra.opensuse.org
   weburls: []
diff --git a/pillar/id/osc-collab2_infra_opensuse_org.sls b/pillar/id/osc-collab2_infra_opensuse_org.sls
new file mode 100644
index 0000000..fe30b3c
--- /dev/null
+++ b/pillar/id/osc-collab2_infra_opensuse_org.sls
@@ -0,0 +1,16 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage: osc-collab
+  roles: []
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: atreju
+
+  aliases: []
+  description: New osc collaboration plattform
+  documentation: []
+  responsible:
+    - dimstar
+  partners: []
+  weburls:
diff --git a/pillar/id/osc-collab_infra_opensuse_org.sls b/pillar/id/osc-collab_infra_opensuse_org.sls
index 7350326..bc02cda 100644
--- a/pillar/id/osc-collab_infra_opensuse_org.sls
+++ b/pillar/id/osc-collab_infra_opensuse_org.sls
@@ -1,7 +1,7 @@
 grains:
   city: nuremberg
   country: de
-  hostusage: []
+  hostusage: osc-collab
   roles: []
   reboot_safe: unknown
   salt_cluster: opensuse
@@ -10,7 +10,8 @@ grains:
   aliases: []
   description: osc collaboration plattform
   documentation: []
-  responsible: []
+  responsible:
+    - dimstar
   partners: []
   weburls:
     - https://osc-collab.opensuse.org/
diff --git a/pillar/id/provo-ns_infra_opensuse_org.sls b/pillar/id/provo-ns_infra_opensuse_org.sls
index 603f1b2..f0752fb 100644
--- a/pillar/id/provo-ns_infra_opensuse_org.sls
+++ b/pillar/id/provo-ns_infra_opensuse_org.sls
@@ -2,18 +2,21 @@ grains:
   city: provo
   country: us
   hostusage:
-    - ns3.o.o
+    - DNS
   roles: []
   reboot_safe: yes
   salt_cluster: opensuse
   virt_cluster: bryce
 
-  aliases: []
+  aliases:
+    - ns3.infra.opensuse.org
   description: Public DNS server for the opensuse.org domain (not reverse)
-  documentation: []
+  documentation:
+    - https://progress.opensuse.org/projects/opensuse-admin-wiki/wiki/DNS
   responsible:
     - lrupp
   partners:
     - nue-ns1.infra.opensuse.org
     - nue-ns2.infra.opensuse.org
+    - qsc-ns4.infra.opensuse-org
   weburls: []
diff --git a/pillar/id/qsc-ns4_infra_opensuse_org.sls b/pillar/id/qsc-ns4_infra_opensuse_org.sls
new file mode 100644
index 0000000..260366e
--- /dev/null
+++ b/pillar/id/qsc-ns4_infra_opensuse_org.sls
@@ -0,0 +1,22 @@
+grains:
+  city: QSC-nuremberg
+  country: de-qsc
+  hostusage:
+    - DNS
+  roles: []
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: slimhat
+
+  aliases: 
+    - ns4.infra.opensuse.org
+  description: Public DNS server for the opensuse.org domain (not reverse)
+  documentation: 
+    - https://progress.opensuse.org/projects/opensuse-admin-wiki/wiki/DNS
+  responsible:
+    - lrupp
+  partners:
+    - nue-ns1.infra.opensuse.org
+    - nue-ns2.infra.opensuse.org
+    - provo-ns.infra.opensuse.org
+  weburls: []
diff --git a/pillar/id/riesling3_infra_opensuse_org.sls b/pillar/id/riesling3_infra_opensuse_org.sls
new file mode 100644
index 0000000..8a46b68
--- /dev/null
+++ b/pillar/id/riesling3_infra_opensuse_org.sls
@@ -0,0 +1,18 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage:
+    - wikis
+  roles:
+    - wiki
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: atreju
+
+  aliases: []
+  description: Planned new $lang.opensuse.org wiki pages
+  documentation: []
+  responsible:
+    - cboltz
+  partners: []
+  weburls: []
diff --git a/pillar/id/slimhat_infra_opensuse_org.sls b/pillar/id/slimhat_infra_opensuse_org.sls
index 160c504..96038f6 100644
--- a/pillar/id/slimhat_infra_opensuse_org.sls
+++ b/pillar/id/slimhat_infra_opensuse_org.sls
@@ -10,12 +10,13 @@ grains:
   virt_cluster: bare-metal
 
   aliases: []
-  description: IPMI backdoor for widehat.infra.opensuse.org (Remote access)
+  description: IPMI backdoor for widehat.infra.opensuse.org (Remote access) and hypervisor for VMs (use slimhat as virt_cluster entry)
   documentation: []
   responsible:
     - kbabioch
     - mcaj
     - rklein
+    - lrupp
   partners: []
   weburls: []
 
diff --git a/pillar/valid_custom_grains.yaml b/pillar/valid_custom_grains.yaml
index 09e1c36..763db08 100644
--- a/pillar/valid_custom_grains.yaml
+++ b/pillar/valid_custom_grains.yaml
@@ -12,7 +12,9 @@ localized:
     default_domain: infra.opensuse.org
     default_virt_cluster: atreju
     domains: infra.opensuse.org
-    virt_cluster: bare-metal
+    virt_cluster:
+      - bare-metal
+      - slimhat
   de:
     city: nuremberg
     default_domain: infra.opensuse.org
diff --git a/pillar/virt_cluster/slimhat.sls b/pillar/virt_cluster/slimhat.sls
new file mode 100644
index 0000000..792d600
--- /dev/null
+++ b/pillar/virt_cluster/slimhat.sls
@@ -0,0 +1 @@
+#
diff --git a/pillar/virt_cluster/slimhat/kvm.sls b/pillar/virt_cluster/slimhat/kvm.sls
new file mode 100644
index 0000000..792d600
--- /dev/null
+++ b/pillar/virt_cluster/slimhat/kvm.sls
@@ -0,0 +1 @@
+#