Yuvipanda has submitted this change and it was merged.
Change subject: labs: Set realm in hiera
......................................................................
labs: Set realm in hiera
This allows us to get rid of it from LDAP variable lists
Bug: T101447
Change-Id: I176a97bf74252a55037a5a575c0572f08410eb0a
---
M hieradata/labs.yaml
M manifests/realm.pp
2 files changed, 2 insertions(+), 1 deletion(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index 17b38ea..b3135ad 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -1,4 +1,5 @@
# General variables that once would have been in realm.pp
+realm: labs
datacenters: [eqiad]
standard::has_ganglia: false
has_nrpe: false
diff --git a/manifests/realm.pp b/manifests/realm.pp
index dd5ae18..193d268 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -3,7 +3,7 @@
#
if $::realm == undef {
- $realm = 'production'
+ $realm = hiera('realm', 'production')
}
if $::projectgroup == undef {
--
To view, visit https://gerrit.wikimedia.org/r/253654
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I176a97bf74252a55037a5a575c0572f08410eb0a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
