From ee35d6c2d7b68e95fcaa38aa4322754eda9b3c52 Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Dec 28 2021 16:30:09 +0000
Subject: Merge branch 'cboltz-water4' into 'production'


add pillar/id/water4

See merge request infra/salt!525
---

diff --git a/pillar/id/water4_infra_opensuse_org.sls b/pillar/id/water4_infra_opensuse_org.sls
new file mode 100644
index 0000000..6dfd9d7
--- /dev/null
+++ b/pillar/id/water4_infra_opensuse_org.sls
@@ -0,0 +1,17 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage:
+    - wiki search backend
+  roles: []
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: atreju
+
+  aliases: []
+  description: Elasticsearch 6.x for the wikis
+  documentation: []
+  responsible:
+    - cboltz
+  partners: []
+  weburls: []