From 73540469542a1736c5b0498eb56d59794445c59e Mon Sep 17 00:00:00 2001
From: Martin Čaj <mcaj@opensuse.org>
Date: Jun 27 2019 12:13:51 +0000
Subject: Merge branch 'add-water3.i.o.o' into 'production'


add water3 into salt control

See merge request infra/salt!248
---

diff --git a/pillar/id/water3_infra_opensuse_org.sls b/pillar/id/water3_infra_opensuse_org.sls
new file mode 100644
index 0000000..3837daf
--- /dev/null
+++ b/pillar/id/water3_infra_opensuse_org.sls
@@ -0,0 +1,10 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage:
+    - en.o.o search backend
+  roles:
+    - wikisearch
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: atreju