Giuseppe Lavagetto has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/314512

Change subject: role::icinga: define facilities on just one host
......................................................................

role::icinga: define facilities on just one host

Hotfix hack for unbreaking the icinga config

Change-Id: I6b7d4c07a4b4773b2c1d42e25dd367c1e3c2e461
---
M manifests/role/icinga.pp
1 file changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/12/314512/1

diff --git a/manifests/role/icinga.pp b/manifests/role/icinga.pp
index c40bf8a..f5bae6e 100644
--- a/manifests/role/icinga.pp
+++ b/manifests/role/icinga.pp
@@ -11,7 +11,13 @@
 class role::icinga(
     $ircbot = true,
 ){
-    include facilities
+
+    # Facilities must be, unluckily, only declared once, not from multiple 
hosts.
+    # Forgive me for this hack while we figure out a clean way to do this.
+    # This is just to unbreak icinga ASAP.
+    if $::hostname == 'neon' {
+        include facilities
+    }
     include icinga::monitor::checkpaging
     include icinga::nsca::firewall
     include icinga::nsca::daemon

-- 
To view, visit https://gerrit.wikimedia.org/r/314512
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b7d4c07a4b4773b2c1d42e25dd367c1e3c2e461
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to