From 43f1e3ed6e08fdd41e3cbaca1696254dbe68c999 Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Jun 02 2019 09:17:12 +0000
Subject: Merge branch 'aedir_pillar_vars' into 'production'


explicitly note that AE-DIR test servers are not managed by salt

See merge request infra/salt!245
---

diff --git a/pillar/id/aedir1.infra.opensuse.org.sls b/pillar/id/aedir1.infra.opensuse.org.sls
index f084aea..5253e27 100644
--- a/pillar/id/aedir1.infra.opensuse.org.sls
+++ b/pillar/id/aedir1.infra.opensuse.org.sls
@@ -3,6 +3,7 @@ grains:
   country: de
   hostusage:
     - AE-DIR test provider (writeable)
+    - not salt-managed because FreeIPA client config must not be installed
   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
index deb6fd8..dd0ee4d 100644
--- a/pillar/id/aedir2.infra.opensuse.org.sls
+++ b/pillar/id/aedir2.infra.opensuse.org.sls
@@ -3,6 +3,7 @@ grains:
   country: de
   hostusage:
     - AE-DIR test consumer (read-only)
+    - not salt-managed because FreeIPA client config must not be installed
   reboot_safe: yes
   salt_cluster: opensuse
   virt_cluster: atreju