Alexandros Kosiaris has submitted this change and it was merged.
Change subject: realm: Do not qualify realm lookups in realm.pp
......................................................................
realm: Do not qualify realm lookups in realm.pp
realm.pp is imported in top scope and hence it is not necessary to fully
qualify the variable lookups done at top scope. This also has the added
benefit of squashing the following log message
(Scope(Class[main])) Could not look up qualified variable '::realm';
which happens at the very first lookup
Change-Id: Ia952649d9b9878327def8d835df60d4c1bb07b70
---
M manifests/realm.pp
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/manifests/realm.pp b/manifests/realm.pp
index 53fdbba..32fdb3d 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -7,11 +7,11 @@
$realm = 'labtest'
}
-if $::realm == undef {
+if $realm == undef {
$realm = hiera('realm', 'production')
}
-if $::realm == 'labs' {
+if $realm == 'labs' {
$labs_metal = hiera('labs_metal', {})
if has_key($labs_metal, $::hostname) {
@@ -86,7 +86,7 @@
# Set some basic variables
# DNS
-if $::realm == 'labs' {
+if $realm == 'labs' {
$dnsconfig = hiera_hash('labsdnsconfig', {})
$nameservers = [ ipresolve($dnsconfig['recursor'],4),
ipresolve($dnsconfig['recursor_secondary'],4) ]
} else {
@@ -209,7 +209,7 @@
'watchlist' ]
# Route list for mail coming from MediaWiki mailer
-$wikimail_smarthost = $::realm ? {
+$wikimail_smarthost = $realm ? {
'production' => $::site ? {
'eqiad' => [ 'wiki-mail-eqiad.wikimedia.org',
'wiki-mail-codfw.wikimedia.org' ],
'codfw' => [ 'wiki-mail-codfw.wikimedia.org',
'wiki-mail-eqiad.wikimedia.org' ],
@@ -222,7 +222,7 @@
'labtest' => [ 'wiki-mail-codfw.wikimedia.org',
'wiki-mail-eqiad.wikimedia.org' ],
}
# Generic, default servers (order matters!)
-$mail_smarthost = $::realm ? {
+$mail_smarthost = $realm ? {
'production' => $::site ? {
'eqiad' => [ 'mx1001.wikimedia.org', 'mx2001.wikimedia.org' ],
'codfw' => [ 'mx2001.wikimedia.org', 'mx1001.wikimedia.org' ],
--
To view, visit https://gerrit.wikimedia.org/r/302675
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia952649d9b9878327def8d835df60d4c1bb07b70
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
