Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/315888
Change subject: logstash: move base::firewall from node to role
......................................................................
logstash: move base::firewall from node to role
Move the "base::firewall" include into the role because
all nodes have it and should have it in the future.
Simplify site.pp / node level.
Change-Id: I0a40c4f6ec00ade3dbe854905c273265c9e5f534
---
M manifests/role/logstash.pp
M manifests/site.pp
2 files changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/88/315888/1
diff --git a/manifests/role/logstash.pp b/manifests/role/logstash.pp
index 05a3262..3a6f769 100644
--- a/manifests/role/logstash.pp
+++ b/manifests/role/logstash.pp
@@ -11,6 +11,7 @@
) {
include ::role::logstash::elasticsearch
include ::logstash
+ include base::firewall
nrpe::monitor_service { 'logstash':
description => 'logstash process',
diff --git a/manifests/site.pp b/manifests/site.pp
index 6b7f891..fb7f146 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1544,16 +1544,13 @@
node /^logstash100[1-2]\.eqiad\.wmnet$/ {
role(logstash, kibana, logstash::apifeatureusage)
- include base::firewall
}
node /^logstash1003\.eqiad\.wmnet$/ {
role(logstash, kibana, logstash::apifeatureusage, logstash::eventlogging)
- include base::firewall
}
node /^logstash100[4-6]\.eqiad\.wmnet$/ {
role(logstash::elasticsearch)
- include base::firewall
}
node /lvs100[1-6]\.wikimedia\.org/ {
--
To view, visit https://gerrit.wikimedia.org/r/315888
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a40c4f6ec00ade3dbe854905c273265c9e5f534
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
