Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/328382 )
Change subject: ChangeProp: Use RESTBase in the other DC to process async requests ...................................................................... ChangeProp: Use RESTBase in the other DC to process async requests Change-Id: I6c79919aa790d267a330cb4c5e3e7008f5bbd325 --- A hieradata/role/codfw/scb.yaml A hieradata/role/eqiad/scb.yaml M modules/changeprop/manifests/init.pp 3 files changed, 11 insertions(+), 2 deletions(-) Approvals: Giuseppe Lavagetto: Verified; Looks good to me, approved Mobrovac: Looks good to me, but someone else must approve diff --git a/hieradata/role/codfw/scb.yaml b/hieradata/role/codfw/scb.yaml new file mode 100644 index 0000000..681bd85 --- /dev/null +++ b/hieradata/role/codfw/scb.yaml @@ -0,0 +1 @@ +changeprop::restbase_uri: http://restbase.svc.eqiad.wmnet:7231 diff --git a/hieradata/role/eqiad/scb.yaml b/hieradata/role/eqiad/scb.yaml new file mode 100644 index 0000000..51925b9 --- /dev/null +++ b/hieradata/role/eqiad/scb.yaml @@ -0,0 +1 @@ +changeprop::restbase_uri: http://restbase.svc.codfw.wmnet:7231 diff --git a/modules/changeprop/manifests/init.pp b/modules/changeprop/manifests/init.pp index 0921130..94ef5e7 100644 --- a/modules/changeprop/manifests/init.pp +++ b/modules/changeprop/manifests/init.pp @@ -15,14 +15,21 @@ # [*purge_port*] # The port the vhtcp daemon listens to. Default: 4827 # +# [*restbase_uri*] +# RESTBase's URI. Note that this is redefined here so that async update +# requests can be sent to the inactive DC. Default: +# 'http://restbase.svc.eqiad.wmnet:7231' +# +# # [*ores_uri*] # The host where ORES service is running. Default: http://ores.svc.eqiad.wmnet:8081 # class changeprop( $broker_list, $purge_host = '239.128.0.112', - $ores_uri = 'http://ores.svc.eqiad.wmnet:8081', $purge_port = 4827, + $restbase_uri = 'http://restbase.svc.eqiad.wmnet:7231', + $ores_uri = 'http://ores.svc.eqiad.wmnet:8081', ) { include ::service::configuration @@ -39,7 +46,7 @@ deployment_vars => { broker_list => $broker_list, mwapi_uri => $::service::configuration::mwapi_uri, - restbase_uri => $::service::configuration::restbase_uri, + restbase_uri => $restbase_uri, ores_uri => $ores_uri, purge_host => $purge_host, purge_port => $purge_port, -- To view, visit https://gerrit.wikimedia.org/r/328382 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6c79919aa790d267a330cb4c5e3e7008f5bbd325 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Mobrovac <mobro...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
