Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/377218 )
Change subject: ChangeProp: Separate packages into profile::changeprop::packages
......................................................................
ChangeProp: Separate packages into profile::changeprop::packages
Change-Id: I768a6000c7ae44017a71f2790b8c5894b88e4f33
---
M modules/profile/manifests/changeprop.pp
A modules/profile/manifests/changeprop/packages.pp
M modules/profile/manifests/cpjobqueue.pp
3 files changed, 12 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/18/377218/1
diff --git a/modules/profile/manifests/changeprop.pp
b/modules/profile/manifests/changeprop.pp
index a9aed56..d825459 100644
--- a/modules/profile/manifests/changeprop.pp
+++ b/modules/profile/manifests/changeprop.pp
@@ -11,15 +11,12 @@
include ::passwords::redis
include ::service::configuration
+ require ::profile::changeprop::packages
+
$kafka_config = kafka_config('main')
$broker_list = $kafka_config['brokers']['string']
$redis_path = "/var/run/nutcracker/redis_${::site}.sock"
$redis_pass = $::passwords::redis::main_password
-
- service::packages { 'changeprop':
- pkgs => ['librdkafka++1', 'librdkafka1'],
- dev_pkgs => ['librdkafka-dev'],
- }
service::node { 'changeprop':
enable => true,
diff --git a/modules/profile/manifests/changeprop/packages.pp
b/modules/profile/manifests/changeprop/packages.pp
new file mode 100644
index 0000000..1df50de
--- /dev/null
+++ b/modules/profile/manifests/changeprop/packages.pp
@@ -0,0 +1,9 @@
+# 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 afc91a0..2fa2463 100644
--- a/modules/profile/manifests/cpjobqueue.pp
+++ b/modules/profile/manifests/cpjobqueue.pp
@@ -25,7 +25,7 @@
) {
include ::passwords::redis
- require ::changeprop::packages
+ require ::profile::changeprop::packages
$kafka_config = kafka_config('main')
--
To view, visit https://gerrit.wikimedia.org/r/377218
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I768a6000c7ae44017a71f2790b8c5894b88e4f33
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
