Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174046
Change subject: Fix-up for I8fbef8279
......................................................................
Fix-up for I8fbef8279
Puppet functions can't return undef, so group is set to the empty string.
Change-Id: I714a3384c04fce630b344a3ccee06b18a5031476
---
M modules/monitoring/manifests/service.pp
1 file changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/46/174046/1
diff --git a/modules/monitoring/manifests/service.pp
b/modules/monitoring/manifests/service.pp
index 1f72612..bbc4bca 100644
--- a/modules/monitoring/manifests/service.pp
+++ b/modules/monitoring/manifests/service.pp
@@ -18,12 +18,18 @@
fail("Parameter $host not defined!")
}
+ if $group {
+ $servicegroups = $group
+ } else {
+ $servicegroups = undef
+ }
+
# Export the nagios service instance
@@nagios_service { "${::hostname} ${title}":
ensure => $ensure,
target => "${config_dir}/puppet_checks.d/${host}.cfg",
host_name => $host,
- servicegroups => $group,
+ servicegroups => $servicegroups,
service_description => $description,
check_command => $check_command,
max_check_attempts => $retries,
--
To view, visit https://gerrit.wikimedia.org/r/174046
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I714a3384c04fce630b344a3ccee06b18a5031476
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
