Alexandros Kosiaris has submitted this change and it was merged.
Change subject: icinga: Remove the hack around facilities, lvs::monitor
......................................................................
icinga: Remove the hack around facilities, lvs::monitor
Since I0137df84c89fcf7, this is no longer required
Change-Id: Ifd847c5fb76a791e19f0acf135311c6d9f7ef734
---
M manifests/role/icinga.pp
1 file changed, 2 insertions(+), 9 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/manifests/role/icinga.pp b/manifests/role/icinga.pp
index 670a469..f109823 100644
--- a/manifests/role/icinga.pp
+++ b/manifests/role/icinga.pp
@@ -11,15 +11,8 @@
class role::icinga(
$ircbot = true,
){
-
- # 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 lvs::monitor
- }
-
+ include facilities
+ include lvs::monitor
include icinga::monitor::checkpaging
include icinga::nsca::firewall
include icinga::nsca::daemon
--
To view, visit https://gerrit.wikimedia.org/r/315510
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd847c5fb76a791e19f0acf135311c6d9f7ef734
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@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
