Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/394268 )
Change subject: monitoring::host: enhance puppet4 compatibility
......................................................................
monitoring::host: enhance puppet4 compatibility
Change-Id: I0270e84f1cdf0d81f69d71609447655d32c1193f
---
M modules/monitoring/manifests/host.pp
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Faidon Liambotis: Looks good to me, but someone else must approve
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/monitoring/manifests/host.pp
b/modules/monitoring/manifests/host.pp
index 4746827..f17fbf0 100644
--- a/modules/monitoring/manifests/host.pp
+++ b/modules/monitoring/manifests/host.pp
@@ -85,12 +85,15 @@
statusmap_image => undef,
}
}
+ } else {
+ $mgmt_host = undef
}
} else {
$icon_image = undef
$vrml_image = undef
$statusmap_image = undef
$real_parents = $parents
+ $mgmt_host = undef
}
$host = {
"${title}" => {
@@ -120,7 +123,7 @@
$rtype = '@@nagios_host'
}
create_resources($rtype, $host)
- if $mgmt_host {
+ if !empty($mgmt_host) {
create_resources($rtype, $mgmt_host)
# We always monitor the BMC so never skip notifications
monitoring::service { "dns_${title}.mgmt":
--
To view, visit https://gerrit.wikimedia.org/r/394268
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0270e84f1cdf0d81f69d71609447655d32c1193f
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
