Dzahn has submitted this change and it was merged.
Change subject: icinga-wm/ircecho: do not set variables in node
......................................................................
icinga-wm/ircecho: do not set variables in node
do not set those variables directly in site.pp
on the 'neon' node.
move them to the role class.
add a comment what this is actually for
Change-Id: I6e5d832c925178a7baae1cdc436efe25dd2c9d13
---
M manifests/role/echoirc.pp
M manifests/site.pp
2 files changed, 7 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/echoirc.pp b/manifests/role/echoirc.pp
index 535eb93..801e453 100644
--- a/manifests/role/echoirc.pp
+++ b/manifests/role/echoirc.pp
@@ -1,4 +1,10 @@
+# role class for Icinga IRC bot
class role::echoirc {
+
+ $ircecho_logs = { '/var/log/icinga/irc.log' => '#wikimedia-operations' }
+ $ircecho_nick = 'icinga-wm'
+ $ircecho_server = 'chat.freenode.net'
+
include ircecho
system::role { 'ircecho': description => 'ircecho server' }
@@ -8,5 +14,6 @@
description => 'ircecho_service_running',
nrpe_command => '/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1:20 -a
ircecho',
}
+
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 6366613..0ae3e52 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1840,9 +1840,6 @@
class { 'base::firewall': }
$domain_search = 'wikimedia.org pmtpa.wmnet eqiad.wmnet
esams.wikimedia.org'
- $ircecho_logs = { '/var/log/icinga/irc.log' => '#wikimedia-operations' }
- $ircecho_nick = 'icinga-wm'
- $ircecho_server = 'chat.freenode.net'
include standard
include icinga::monitor
include role::ishmael
--
To view, visit https://gerrit.wikimedia.org/r/129662
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6e5d832c925178a7baae1cdc436efe25dd2c9d13
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
