Elukey has submitted this change and it was merged.
Change subject: Update the varnishkafka module with latest changes.
......................................................................
Update the varnishkafka module with latest changes.
The varnishkafka module now ships a basic rsyslog configuration,
allowing us to remove it from the files/varnish directory.
Bug: T129344
Change-Id: Ib78554bd9026f14ffb809832ac198f8b4283101c
---
D files/varnish/varnishkafka_rsyslog.conf
M modules/role/manifests/cache/kafka.pp
M modules/varnishkafka
3 files changed, 0 insertions(+), 16 deletions(-)
Approvals:
Elukey: Looks good to me, approved
Ottomata: Looks good to me, but someone else must approve
Ema: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/files/varnish/varnishkafka_rsyslog.conf
b/files/varnish/varnishkafka_rsyslog.conf
deleted file mode 100644
index ff8f31f..0000000
--- a/files/varnish/varnishkafka_rsyslog.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# NOTE: This file is managed by Puppet.
-
-# rsyslogd varnishkafka config.
-if $programname == 'varnishkafka' then /var/log/varnishkafka.log
diff --git a/modules/role/manifests/cache/kafka.pp
b/modules/role/manifests/cache/kafka.pp
index e8f61d2..e5a2e92 100644
--- a/modules/role/manifests/cache/kafka.pp
+++ b/modules/role/manifests/cache/kafka.pp
@@ -5,18 +5,6 @@
require role::kafka::analytics::config
$kafka_brokers = $::role::kafka::analytics::config::brokers_array
- # Make sure varnishkafka rsyslog file is in place properly.
- rsyslog::conf { 'varnishkafka':
- source => 'puppet:///files/varnish/varnishkafka_rsyslog.conf',
- priority => 70,
- }
-
- # Make sure that Rsyslog::Conf['varnishkafka'] happens
- # before the first varnishkafka::instance
- # so that logs will go to rsyslog the first time puppet
- # sets up varnishkafka.
- Rsyslog::Conf['varnishkafka'] -> Varnishkafka::Instance <| |>
-
# APT pinning for Varnish 3
if (hiera('varnish_version4', false)) {
apt::pin { 'varnishkafka':
diff --git a/modules/varnishkafka b/modules/varnishkafka
index 3f6231f..b2dddf4 160000
--- a/modules/varnishkafka
+++ b/modules/varnishkafka
-Subproject commit 3f6231f06e4f9add14196432b8f53ea603646316
+Subproject commit b2dddf491cac8bf6caa49da9ad32f228c4a34a90
--
To view, visit https://gerrit.wikimedia.org/r/280678
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib78554bd9026f14ffb809832ac198f8b4283101c
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey <[email protected]>
Gerrit-Reviewer: Elukey <[email protected]>
Gerrit-Reviewer: Ema <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
