Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/377208 )
Change subject: trendingedits: move to role/profile
......................................................................
trendingedits: move to role/profile
Change-Id: Ia0a2248c7282583a8c2fcc87e94d86fd749c9c33
---
A modules/profile/manifests/trendingedits.pp
M modules/role/manifests/trendingedits.pp
D modules/trendingedits/manifests/init.pp
D modules/trendingedits/manifests/packages.pp
4 files changed, 34 insertions(+), 64 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/08/377208/1
diff --git a/modules/profile/manifests/trendingedits.pp
b/modules/profile/manifests/trendingedits.pp
new file mode 100644
index 0000000..066ea0b
--- /dev/null
+++ b/modules/profile/manifests/trendingedits.pp
@@ -0,0 +1,33 @@
+# Profile class for trendingedits
+class profile::trendingedits {
+
+ $kafka_config = kafka_config('main')
+ $port = 6699
+
+ service::packages { 'trendingedits':
+ pkgs => ['librdkafka++1', 'librdkafka1'],
+ dev_pkgs => ['librdkafka-dev'],
+ }
+
+ service::node { 'trendingedits':
+ port => $port,
+ repo => 'trending-edits/deploy',
+ healthcheck_url => '',
+ has_spec => true,
+ deployment => 'scap3',
+ deployment_config => true,
+ deployment_vars => {
+ broker_list => $kafka_config['brokers']['string'],
+ site => $::site,
+ },
+ environment => {
+ 'UV_THREADPOOL_SIZE' => 16
+ },
+ }
+
+ class { '::trendingedits':
+ port => $port,
+ broker_list =>
+ }
+
+}
diff --git a/modules/role/manifests/trendingedits.pp
b/modules/role/manifests/trendingedits.pp
index 7716f0c..90a1205 100644
--- a/modules/role/manifests/trendingedits.pp
+++ b/modules/role/manifests/trendingedits.pp
@@ -1,17 +1,8 @@
# Role class for trendingedits
class role::trendingedits {
-
- $kafka_config = kafka_config('main')
- $port = 6699
-
system::role { 'trendingedits':
description => 'computes the list of currently-trending articles',
}
- class { '::trendingedits':
- port => $port,
- broker_list => $kafka_config['brokers']['string'],
- }
-
+ include ::profile::trendingedits
}
-
diff --git a/modules/trendingedits/manifests/init.pp
b/modules/trendingedits/manifests/init.pp
deleted file mode 100644
index 075cf75..0000000
--- a/modules/trendingedits/manifests/init.pp
+++ /dev/null
@@ -1,38 +0,0 @@
-# == Class: trendingedits
-#
-# This class installs and configures the trending edits service, which follows
-# events from the EventBus system in real time and computes the list of
-# currently-trending articles based on the number of edits.
-#
-# === Parameters
-#
-# [*port*]
-# The port to bind the service to
-#
-# [*broker_list*]
-# Comma-separated list of Kafka broker URIs
-#
-class trendingedits(
- $port,
- $broker_list,
-) {
-
- require ::trendingedits::packages
-
- service::node { 'trendingedits':
- port => $port,
- repo => 'trending-edits/deploy',
- healthcheck_url => '',
- has_spec => true,
- deployment => 'scap3',
- deployment_config => true,
- deployment_vars => {
- broker_list => $broker_list,
- site => $::site,
- },
- environment => {
- 'UV_THREADPOOL_SIZE' => 16
- },
- }
-
-}
diff --git a/modules/trendingedits/manifests/packages.pp
b/modules/trendingedits/manifests/packages.pp
deleted file mode 100644
index 71b4530..0000000
--- a/modules/trendingedits/manifests/packages.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-# == Class: trendingedits::packages
-#
-# Installs the packages needed by the trending edits service
-#
-# NOTE: this is a temporary work-around for the CI to be able to install
-# development packages. In the future, we want to have more integration so as
to
-# run tests as close to production as possible.
-#
-class trendingedits::packages {
-
- service::packages { 'trendingedits':
- pkgs => ['librdkafka++1', 'librdkafka1'],
- dev_pkgs => ['librdkafka-dev'],
- }
-
-}
--
To view, visit https://gerrit.wikimedia.org/r/377208
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0a2248c7282583a8c2fcc87e94d86fd749c9c33
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
