Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/345316 )
Change subject: parsoid: make config management independent of service::node
(take 2)
......................................................................
parsoid: make config management independent of service::node (take 2)
Since parsoid::testing is using the git deployment, let's do things for
it too.
I am frankly not a fan of this division of the code, I'm thinking it
would be easier to split the code in two profiles. Not doing so at the
moment as I have bigger fish to fry.
Change-Id: I6207c8890e85cad6f18b8bb7f7d8c5033db2554c
---
M modules/parsoid/manifests/init.pp
1 file changed, 30 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/16/345316/1
diff --git a/modules/parsoid/manifests/init.pp
b/modules/parsoid/manifests/init.pp
index 470cee0..ab2feec 100644
--- a/modules/parsoid/manifests/init.pp
+++ b/modules/parsoid/manifests/init.pp
@@ -45,31 +45,44 @@
service::node { 'parsoid':
port => $port,
starter_script => 'src/bin/server.js',
- # NOTE: this is useful only when deployment == 'git'
- config => {
- localsettings => $settings_file,
- },
healthcheck_url => '/',
has_spec => false,
logging_name => $logging_name,
- statsd_prefix => $statsd_prefix,
auto_refresh => false,
deployment => $deployment,
deployment_config => false,
full_config => 'external',
}
- service::node::config::scap3 { 'parsoid':
- port => $port,
- starter_module => 'src/lib/index.js',
- entrypoint => 'apiServiceWorker',
- heap_limit => 800,
- heartbeat_to => 180000,
- statsd_prefix => $statsd_prefix,
- auto_refresh => false,
- deployment_vars => {
- mwapi_server => $mwapi_server,
- mwapi_proxy => $mwapi_proxy,
- },
+ if ($deployment == 'scap3') {
+ service::node::config::scap3 { 'parsoid':
+ port => $port,
+ starter_module => 'src/lib/index.js',
+ entrypoint => 'apiServiceWorker',
+ logging_name => $logging_name,
+ heap_limit => 800,
+ heartbeat_to => 180000,
+ statsd_prefix => $statsd_prefix,
+ auto_refresh => false,
+ deployment_vars => {
+ mwapi_server => $mwapi_server,
+ mwapi_proxy => $mwapi_proxy,
+ },
+ }
+ } else {
+ service::node::config { 'parsoid':
+ port => $port,
+ starter_module => 'src/lib/index.js',
+ entrypoint => 'apiServiceWorker',
+ logging_name => $logging_name,
+ heap_limit => 800,
+ heartbeat_to => 180000,
+ statsd_prefix => $statsd_prefix,
+ auto_refresh => false,
+ config => {
+ localsettings => $settings_file,
+ },
+ }
}
+
}
--
To view, visit https://gerrit.wikimedia.org/r/345316
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6207c8890e85cad6f18b8bb7f7d8c5033db2554c
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
