Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/191589
Change subject: base: move selector outside resource block
......................................................................
base: move selector outside resource block
Change-Id: Ia100343eee8c3565539d6287f6548dea42c7abd0
---
M modules/base/manifests/init.pp
1 file changed, 15 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/89/191589/1
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 4c42c36..c4f6148 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -57,13 +57,15 @@
$certname = undef
}
+ $puppetmaster = $::realm ? {
+ 'labs' => $::site ? {
+ 'eqiad' => 'virt1000.wikimedia.org',
+ }
+ default => 'puppet',
+ }
+
class { 'base::puppet':
- server => $::realm ? {
- 'labs' => $::site ? {
- 'eqiad' => 'virt1000.wikimedia.org',
- },
- default => 'puppet',
- },
+ server => $puppetmaster,
certname => $certname,
}
@@ -87,11 +89,14 @@
# include base::monitor::host.
# if $nagios_contact_group is set, then use it
# as the monitor host's contact group.
+
+ $group_contact = $::nagios_contact_group ? {
+ undef => 'admins',
+ default => $::nagios_contact_group,
+ }
+
class { 'base::monitoring::host':
- contact_group => $::nagios_contact_group ? {
- undef => 'admins',
- default => $::nagios_contact_group,
- }
+ contact_group => $group_contact,
}
# CA for the new ldap-eqiad/ldap-codfw ldap servers, among
--
To view, visit https://gerrit.wikimedia.org/r/191589
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia100343eee8c3565539d6287f6548dea42c7abd0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
