From 3adeaea251a008c41a2290e82efbe8ca14318e82 Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Apr 26 2019 17:57:35 +0000
Subject: Merge branch 'aedir_reboot_safe' into 'production'


pillar/id entries for AE-DIR test servers

See merge request infra/salt!244
---

diff --git a/pillar/id/aedir1.infra.opensuse.org.sls b/pillar/id/aedir1.infra.opensuse.org.sls
new file mode 100644
index 0000000..f084aea
--- /dev/null
+++ b/pillar/id/aedir1.infra.opensuse.org.sls
@@ -0,0 +1,8 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage:
+    - AE-DIR test provider (writeable)
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/aedir2.infra.opensuse.org.sls b/pillar/id/aedir2.infra.opensuse.org.sls
new file mode 100644
index 0000000..deb6fd8
--- /dev/null
+++ b/pillar/id/aedir2.infra.opensuse.org.sls
@@ -0,0 +1,8 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage:
+    - AE-DIR test consumer (read-only)
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: atreju