Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: Parsoid: Use Scap3 for config-file deploys
......................................................................
Parsoid: Use Scap3 for config-file deploys
This patch enables deployers to deploy Parsoid's config.yaml file
directly from the deployment repository.
Note that ruthenium's config still needs to be deployed via ops/puppet
for the time being, as it isn't using Scap as its dpeloyment method.
Bug: T144596
Change-Id: I3fd6c0cebb47e817eca903abfe92fe6e025af867
---
M hieradata/labs/deployment-prep/common.yaml
M modules/parsoid/manifests/init.pp
2 files changed, 15 insertions(+), 14 deletions(-)
Approvals:
Arlolra: Looks good to me, but someone else must approve
Mobrovac: Looks good to me, but someone else must approve
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/labs/deployment-prep/common.yaml
b/hieradata/labs/deployment-prep/common.yaml
index 49de3da..6d6718d 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -89,7 +89,6 @@
text: {}
upload: {}
zotero: {}
-parsoid::settings_file: 'conf/wmf/betalabs.localsettings.js'
cassandra::listen_address: '%{::ipaddress_eth0}'
cassandra::rpc_address: '%{::ipaddress_eth0}'
cassandra::seeds:
diff --git a/modules/parsoid/manifests/init.pp
b/modules/parsoid/manifests/init.pp
index 2e7f99f..3ffee3d 100644
--- a/modules/parsoid/manifests/init.pp
+++ b/modules/parsoid/manifests/init.pp
@@ -32,21 +32,23 @@
) {
service::node { 'parsoid':
- port => $port,
- starter_module => 'src/lib/index.js',
- entrypoint => 'apiServiceWorker',
- starter_script => 'src/bin/server.js',
- config => {
+ port => $port,
+ starter_module => 'src/lib/index.js',
+ entrypoint => 'apiServiceWorker',
+ starter_script => 'src/bin/server.js',
+ # NOTE: this is useful only when deployment == 'git'
+ config => {
localsettings => $settings_file,
},
- heap_limit => 800,
- heartbeat_to => 180000,
- healthcheck_url => '/',
- has_spec => false,
- logging_name => $logging_name,
- statsd_prefix => $statsd_prefix,
- auto_refresh => false,
- deployment => $deployment,
+ heap_limit => 800,
+ heartbeat_to => 180000,
+ healthcheck_url => '/',
+ has_spec => false,
+ logging_name => $logging_name,
+ statsd_prefix => $statsd_prefix,
+ auto_refresh => false,
+ deployment => $deployment,
+ deployment_config => true,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/315069
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3fd6c0cebb47e817eca903abfe92fe6e025af867
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Arlolra <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
