Ottomata has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405014 )
Change subject: Use jumbo Kafka for EventStreams in deployment-prep ...................................................................... Use jumbo Kafka for EventStreams in deployment-prep No-op in prod. Bug: T185225 Change-Id: I05b13521a9f7086733983d426a8fa89d857547c9 --- M hieradata/labs/deployment-prep/common.yaml M modules/profile/manifests/eventstreams.pp 2 files changed, 3 insertions(+), 4 deletions(-) Approvals: Ottomata: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index 7700115..ba33786 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -362,7 +362,7 @@ profile::recommendation_api::wdqs_uri: http://wdqs-test.wmflabs.org # Eventstreams config -profile::eventstreams::kafka_cluster_name: main +profile::eventstreams::kafka_cluster_name: jumbo profile::eventstreams::streams: test: topics: ["%{::site}.test.event"] @@ -370,7 +370,6 @@ topics: ["%{::site}.mediawiki.revision-create"] recentchange: topics: ["%{::site}.mediawiki.recentchange"] -profile::eventstreams::rdkafka_config: {} cache::be_transient_gb: 0 cache::fe_transient_gb: 0 diff --git a/modules/profile/manifests/eventstreams.pp b/modules/profile/manifests/eventstreams.pp index d340984..92a618e 100644 --- a/modules/profile/manifests/eventstreams.pp +++ b/modules/profile/manifests/eventstreams.pp @@ -34,8 +34,8 @@ # filtertags: labs-project-deployment-prep class profile::eventstreams( $kafka_cluster_name = hiera('profile::eventstreams::kafka_cluster_name'), - $streams = hiera('profile::eventstreams::streams'), - $rdkafka_config = hiera('profile::eventstreams::rdkafka_config') + $streams = hiera('profile::eventstreams::streams'), + $rdkafka_config = hiera('profile::eventstreams::rdkafka_config', {}) ) { $kafka_config = kafka_config($kafka_cluster_name) $broker_list = $kafka_config['brokers']['string'] -- To view, visit https://gerrit.wikimedia.org/r/405014 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I05b13521a9f7086733983d426a8fa89d857547c9 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata <ao...@wikimedia.org> Gerrit-Reviewer: Ottomata <ao...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
