Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/292268
Change subject: ores: Allow specifying redis_password
......................................................................
ores: Allow specifying redis_password
Change-Id: I3127cc2305e010b506c5be1132c07d17fc30d142
---
M modules/ores/manifests/web.pp
1 file changed, 36 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/68/292268/1
diff --git a/modules/ores/manifests/web.pp b/modules/ores/manifests/web.pp
index 8d289a1..40c72b7 100644
--- a/modules/ores/manifests/web.pp
+++ b/modules/ores/manifests/web.pp
@@ -3,6 +3,7 @@
class ores::web(
$workers_per_core = 4,
$redis_host = '127.0.0.1',
+ $redis_password = undef,
$port = 8081,
) {
require ores::base
@@ -19,33 +20,52 @@
processes => $processes,
}
}
-
- # For now puppet ships the config until we migrate it to scap3 as well
- ores::config { 'main':
- # lint:ignore:arrow_alignment
- config => {
- 'ores' => {
- 'data_paths' => {
- 'nltk' =>
"${::ores::base::config_path}/submodules/wheels/nltk/",
- }
- },
+ # lint:ignore:arrow_alignment
+ $base_config = {
+ 'ores' => {
+ 'data_paths' => {
+ 'nltk' =>
"${::ores::base::config_path}/submodules/wheels/nltk/",
+ }
+ },
+ 'score_caches' => {
+ 'ores_redis' => {
+ 'host' => $redis_host,
+ 'port' => '6380',
+ }
+ },
+ 'score_processors' => {
+ 'ores_celery' => {
+ 'BROKER_URL' => "redis://${redis_host}:6379",
+ 'CELERY_RESULT_BACKEND' => "redis://${redis_host}:6379",
+ }
+ },
+ }
+ if $redis_password {
+ $pass_config = {
'score_caches' => {
'ores_redis' => {
- 'host' => $redis_host,
- 'port' => '6380',
+ 'password' => $redis_password,
}
},
'score_processors' => {
'ores_celery' => {
- 'BROKER_URL' => "redis://${redis_host}:6379",
- 'CELERY_RESULT_BACKEND' => "redis://${redis_host}:6379",
+ 'BROKER_URL' =>
"redis://:${redis_password}@${redis_host}:6379",
+ 'CELERY_RESULT_BACKEND' =>
"redis://:${redis_password}@${redis_host}:6379",
}
},
- },
+ }
+ $config = deep_merge($base_config, $pass_config)
+ } else {
+ $config = $base_config
+ }
+ # lint:endignore
+ # For now puppet ships the config until we migrate it to scap3 as well
+ ores::config { 'main':
+ config => $config,
priority => '99',
mode => '0444',
owner => 'deploy-service',
group => 'deploy-service',
- # lint:endignore
}
+
}
--
To view, visit https://gerrit.wikimedia.org/r/292268
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3127cc2305e010b506c5be1132c07d17fc30d142
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
