From f6bf99b21145c3f3fda39115b55c17883a89764e Mon Sep 17 00:00:00 2001
From: Lars Vogdt <lars@linux-schulserver.de>
Date: Jan 24 2020 09:31:09 +0000
Subject: Merge branch 'lrupp/add_forum' into 'production'


New machine for forums.opensuse.org

See merge request infra/salt!316
---

diff --git a/pillar/id/forum_infra_opensuse_org.sls b/pillar/id/forum_infra_opensuse_org.sls
new file mode 100644
index 0000000..87586a9
--- /dev/null
+++ b/pillar/id/forum_infra_opensuse_org.sls
@@ -0,0 +1,19 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage:
+    - forums.o.o
+  roles: []
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: atreju
+
+  aliases: []
+  description: Webserver running vbulletin for forums.opensuse.org
+  documentation:
+    - https://www.vbulletin.com/
+  responsible:
+    - pjessen
+  partners: []
+  weburls:
+    - https://forums.opensuse.org