Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/377238 )
Change subject: Kafka: Make all Kafka clients require the same set of packages ...................................................................... Kafka: Make all Kafka clients require the same set of packages Change-Id: I805386bab2a2ff2a7f297d5308d570f1b6a7d1d1 --- M modules/profile/manifests/changeprop.pp D modules/profile/manifests/changeprop/packages.pp M modules/profile/manifests/cpjobqueue.pp M modules/profile/manifests/eventstreams.pp A modules/profile/manifests/kafka/librdkafka.pp M modules/profile/manifests/trendingedits.pp 6 files changed, 16 insertions(+), 19 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/38/377238/1 diff --git a/modules/profile/manifests/changeprop.pp b/modules/profile/manifests/changeprop.pp index d825459..640f263 100644 --- a/modules/profile/manifests/changeprop.pp +++ b/modules/profile/manifests/changeprop.pp @@ -11,7 +11,7 @@ include ::passwords::redis include ::service::configuration - require ::profile::changeprop::packages + require ::profile::kafka::librdkafka $kafka_config = kafka_config('main') $broker_list = $kafka_config['brokers']['string'] diff --git a/modules/profile/manifests/changeprop/packages.pp b/modules/profile/manifests/changeprop/packages.pp deleted file mode 100644 index 1df50de..0000000 --- a/modules/profile/manifests/changeprop/packages.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Packages required by changeprop and cpjobqueue -class profile::changeprop::packages() { - - service::packages { 'changeprop': - pkgs => ['librdkafka++1', 'librdkafka1'], - dev_pkgs => ['librdkafka-dev'], - } - -} diff --git a/modules/profile/manifests/cpjobqueue.pp b/modules/profile/manifests/cpjobqueue.pp index 2fa2463..7d98e2f 100644 --- a/modules/profile/manifests/cpjobqueue.pp +++ b/modules/profile/manifests/cpjobqueue.pp @@ -25,7 +25,7 @@ ) { include ::passwords::redis - require ::profile::changeprop::packages + require ::profile::kafka::librdkafka $kafka_config = kafka_config('main') diff --git a/modules/profile/manifests/eventstreams.pp b/modules/profile/manifests/eventstreams.pp index d340984..0917a68 100644 --- a/modules/profile/manifests/eventstreams.pp +++ b/modules/profile/manifests/eventstreams.pp @@ -37,11 +37,11 @@ $streams = hiera('profile::eventstreams::streams'), $rdkafka_config = hiera('profile::eventstreams::rdkafka_config') ) { + + require ::profile::kafka::librdkafka + $kafka_config = kafka_config($kafka_cluster_name) $broker_list = $kafka_config['brokers']['string'] - service::packages { 'eventstreams': - pkgs => ['librdkafka++1', 'librdkafka1'], - } service::node { 'eventstreams': enable => true, diff --git a/modules/profile/manifests/kafka/librdkafka.pp b/modules/profile/manifests/kafka/librdkafka.pp new file mode 100644 index 0000000..b0fabab --- /dev/null +++ b/modules/profile/manifests/kafka/librdkafka.pp @@ -0,0 +1,9 @@ +# Packages required by Kafka clients +class profile::kafka::librdkafka() { + + service::packages { 'librdkafka': + pkgs => ['librdkafka++1', 'librdkafka1'], + dev_pkgs => ['librdkafka-dev'], + } + +} diff --git a/modules/profile/manifests/trendingedits.pp b/modules/profile/manifests/trendingedits.pp index ca57360..6e67cc0 100644 --- a/modules/profile/manifests/trendingedits.pp +++ b/modules/profile/manifests/trendingedits.pp @@ -1,13 +1,10 @@ # Profile class for trendingedits class profile::trendingedits { + require ::profile::kafka::librdkafka + $kafka_config = kafka_config('main') $port = 6699 - - service::packages { 'trendingedits': - pkgs => ['librdkafka++1', 'librdkafka1'], - dev_pkgs => ['librdkafka-dev'], - } service::node { 'trendingedits': port => $port, -- To view, visit https://gerrit.wikimedia.org/r/377238 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I805386bab2a2ff2a7f297d5308d570f1b6a7d1d1 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Mobrovac <mobro...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits