maint: flatten IPA hierarchy

We aren't doing anything interesting in the cluster specific IPA configurations. This commit flattens them into the role definition.
lsst-it · Feb 20, 2020 · 492838d · 492838d
1 parent 03f6332
commit 492838d
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 12 deletions.
diff --git a/hieradata/cluster/corecp/role/ipamaster.yaml b/hieradata/cluster/corecp/role/ipamaster.yaml
diff --git a/hieradata/cluster/corecp/role/ipareplica.yaml b/hieradata/cluster/corecp/role/ipareplica.yaml
diff --git a/hieradata/cluster/coretuc/role/ipamaster.yaml b/hieradata/cluster/coretuc/role/ipamaster.yaml
diff --git a/hieradata/cluster/coretuc/role/ipareplica.yaml b/hieradata/cluster/coretuc/role/ipareplica.yaml
diff --git a/hieradata/org/lsst/role/ipamaster.yaml b/hieradata/org/lsst/role/ipamaster.yaml
@@ -14,3 +14,5 @@ easy_ipa::install_epel: false
 easy_ipa::install_autofs: false
 easy_ipa::install_sssdtools: false
 easy_ipa::install_kstart: false
+easy_ipa::ipa_server_fqdn: "%{facts.fqdn}"
+easy_ipa::ip_address: "%{facts.networking.ip}"
diff --git a/hieradata/org/lsst/role/ipareplica.yaml b/hieradata/org/lsst/role/ipareplica.yaml
@@ -14,3 +14,5 @@ easy_ipa::install_epel: false
 easy_ipa::install_autofs: false
 easy_ipa::install_sssdtools: false
 easy_ipa::install_kstart: false
+easy_ipa::ipa_server_fqdn: "%{facts.fqdn}"
+easy_ipa::ip_address: "%{facts.networking.ip}"