From 4942298d7d6c4202b17720fc24b6e3b3d1f83565 Mon Sep 17 00:00:00 2001
From: Lars Vogdt <lars@linux-schulserver.de>
Date: Jan 28 2020 15:47:39 +0000
Subject: Merge branch 'mstrigl/add_matrix' into 'production'


New machine for matrix.o.o

See merge request infra/salt!322
---

diff --git a/pillar/id/matrix_infra_opensuse.org.sls b/pillar/id/matrix_infra_opensuse.org.sls
new file mode 100644
index 0000000..4e0396a
--- /dev/null
+++ b/pillar/id/matrix_infra_opensuse.org.sls
@@ -0,0 +1,17 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage:
+    - matrix.o.o
+  roles: []
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: atreju
+
+  aliases: []
+  description: Server to host matrix and its bridges 
+  documentation:
+    - https://matrix.org/
+  responsible:
+    - hellcp
+  partners: []