Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/399702 )
Change subject: site/logging/kafkatee: move includes from site to role ...................................................................... site/logging/kafkatee: move includes from site to role Change-Id: Ib70d493d00e2844237173c68873e9e76c56c1e03 --- M manifests/site.pp M modules/role/manifests/logging/kafkatee/webrequest/ops.pp 2 files changed, 6 insertions(+), 5 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/manifests/site.pp b/manifests/site.pp index 7b5cf80..ea86f06 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1751,9 +1751,6 @@ node 'oxygen.eqiad.wmnet' { role(logging::kafkatee::webrequest::ops) - - include ::base::firewall - include ::standard } # parser cache databases diff --git a/modules/role/manifests/logging/kafkatee/webrequest/ops.pp b/modules/role/manifests/logging/kafkatee/webrequest/ops.pp index 14393dd..a2c907e 100644 --- a/modules/role/manifests/logging/kafkatee/webrequest/ops.pp +++ b/modules/role/manifests/logging/kafkatee/webrequest/ops.pp @@ -2,10 +2,14 @@ # Includes output filters useful for operational debugging. # class role::logging::kafkatee::webrequest::ops { - require_package('socat') + + include ::standard + include ::profile::base::firewall + include ::geoip # lint:ignore:wmf_styleguide include role::logging::kafkatee::webrequest::base - include ::geoip # lint:ignore:wmf_styleguide + + require_package('socat') $webrequest_log_directory = $::role::logging::kafkatee::webrequest::base::webrequest_log_directory $logstash_host = hiera('logstash_host') -- To view, visit https://gerrit.wikimedia.org/r/399702 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib70d493d00e2844237173c68873e9e76c56c1e03 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@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