Mobrovac has uploaded a new change for review. https://gerrit.wikimedia.org/r/292573
Change subject: Change Prop: Use the URIs for MW and RB from service::configuration ...................................................................... Change Prop: Use the URIs for MW and RB from service::configuration service::configuration now holds the canonical URIs for the MW and RB APIs, so no need to duplicate them. Note that this is a no-op in both prod and labs. Change-Id: I8068ff45a66f209b74578efdb8669b7ef69a43e4 --- M hieradata/labs/deployment-prep/common.yaml M modules/changeprop/manifests/init.pp 2 files changed, 5 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/73/292573/1 diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index 629be2d..4120f7c 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -16,8 +16,6 @@ service::configuration::logstash_host: deployment-logstash2.deployment-prep.eqiad.wmflabs citoid::zotero_host: deployment-zotero01.deployment-prep.eqiad.wmflabs citoid::zotero_port: 1969 -changeprop::mwapi_uri: http://deployment-mediawiki02.deployment-prep.eqiad.wmflabs/w/api.php -changeprop::restbase_uri: http://deployment-restbase02.deployment-prep.eqiad.wmflabs:7231 changeprop::purge_host: deployment-cache-text04.deployment-prep.eqiad.wmflabs changeprop::concurrency: 20 graphoid::allowed_domains: diff --git a/modules/changeprop/manifests/init.pp b/modules/changeprop/manifests/init.pp index 367993e..404fa02 100644 --- a/modules/changeprop/manifests/init.pp +++ b/modules/changeprop/manifests/init.pp @@ -10,14 +10,6 @@ # The URI (host:port) of the Zookeeper broker(s) controlling the Kafka cluster # from which to receive the events. # -# [*mwapi_uri*] -# The full URI of the MW API contact point. Default: -# http://api.svc.${::mw_primary}.wmnet/w/api.php -# -# [*restbase_uri*] -# The host/IP where to reach RESTBase. Default: -# http://restbase.svc.${::rb_site}.wmnet:7231 -# # [*purge_host*] # The vhtcpd daemon host to send purge requests to. Default: 239.128.0.112 # @@ -30,13 +22,16 @@ # class changeprop( $zk_uri, - $mwapi_uri = "http://api.svc.${::mw_primary}.wmnet/w/api.php";, - $restbase_uri = "http://restbase.svc.${::rb_site}.wmnet:7231";, $purge_host = '239.128.0.112', $purge_port = 4827, $concurrency = 100, ) { + include ::service::configuration + + $restbase_uri = $::service::configuration::restbase_uri + $mwapi_uri = $::service::configuration::mwapi_uri + service::node { 'changeprop': enable => true, port => 7272, -- To view, visit https://gerrit.wikimedia.org/r/292573 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8068ff45a66f209b74578efdb8669b7ef69a43e4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Mobrovac <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
