Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/364673 )
Change subject: Monitoring: confine IPMI checks better to unbreak installs
......................................................................
Monitoring: confine IPMI checks better to unbreak installs
New installations in our environment where broken on a catch-22 between
having the ipmi_lan fact populated and the installation of the packages
required for ipmi_lan to work. If guard the uses of ipmi_lan fact better
in order to unbreak that. Note that this removes some functionality we
would like to have, namely the monitoring of
misbehaving/broken/misconfigured BMCs. But it's wrong to do this on this
level and it's better to do it in an unrelated check via NRPE on the
host level
Change-Id: I79139d91f5da217b2222438ff3061d046802c915
---
M modules/monitoring/manifests/host.pp
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/modules/monitoring/manifests/host.pp
b/modules/monitoring/manifests/host.pp
index 8eeb971..4ff789b 100644
--- a/modules/monitoring/manifests/host.pp
+++ b/modules/monitoring/manifests/host.pp
@@ -63,7 +63,8 @@
} else {
$real_parents = undef
}
- if $facts['has_ipmi'] {
+ # We have a BMC, and the BMC is configured and it has an IP address
+ if $facts['has_ipmi'] and $facts['ipmi_lan'] and 'ipaddress' in
$facts['ipmi_lan'] {
$mgmt_host = {
"${title}.mgmt.${::site}.wmnet" => {
ensure => $ensure,
--
To view, visit https://gerrit.wikimedia.org/r/364673
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I79139d91f5da217b2222438ff3061d046802c915
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Volans <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
