From 845a42c199d85b276cbbf1d3a91f38d939a2a018 Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Mar 05 2020 21:59:36 +0000
Subject: Merge branch 'hellcp/introduce-freeipa2' into production


See merge request infra/salt!354

(manually merged on the commandline because the CI is currently broken)

---

diff --git a/pillar/id/freeipa2_infra_opensuse_org.sls b/pillar/id/freeipa2_infra_opensuse_org.sls
new file mode 100644
index 0000000..0d411a0
--- /dev/null
+++ b/pillar/id/freeipa2_infra_opensuse_org.sls
@@ -0,0 +1,20 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage:
+    - freeipa2
+  roles: []
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: atreju
+
+  aliases: []
+  description: Secondary FreeIPA server for testing with identification.
+  documentation: 
+    - https://www.freeipa.org/page/Documentation
+  responsible:
+    - hellcp
+    - Pharaoh_Atem
+  partners: []
+  weburls:
+    - https://freeipa2.infra.opensuse.org/
diff --git a/pillar/osfullname/CentOS_Linux.sls b/pillar/osfullname/CentOS_Linux.sls
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/pillar/osfullname/CentOS_Linux.sls
diff --git a/pillar/osmajorrelease/8.sls b/pillar/osmajorrelease/8.sls
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/pillar/osmajorrelease/8.sls
diff --git a/pillar/salt_cluster/opensuse/osfullname/CentOS_Linux.sls b/pillar/salt_cluster/opensuse/osfullname/CentOS_Linux.sls
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/pillar/salt_cluster/opensuse/osfullname/CentOS_Linux.sls
diff --git a/pillar/top.sls b/pillar/top.sls
index 452826a..6b1b9c2 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -19,7 +19,7 @@
     - virtual.{{ virtual }}
   'osfullname:{{ osfullname }}':
     - match: grain
-    - osfullname.{{ osfullname }}
+    - osfullname.{{ osfullname.replace(' ', '_') }}
   'osmajorrelease:{{ osmajorrelease }}':
     - match: grain
     - osmajorrelease.{{ osmajorrelease }}
@@ -27,7 +27,7 @@
   'salt_cluster:{{ salt_cluster }}':
     - match: grain
     - salt_cluster.{{ salt_cluster }}
-    - salt_cluster.{{ salt_cluster }}.osfullname.{{ osfullname }}
+    - salt_cluster.{{ salt_cluster }}.osfullname.{{ osfullname.replace(' ', '_') }}
   '{{ id }}':
     - id.{{ id.replace('.', '_') }}
   {% endif %}