Alexandros Kosiaris has submitted this change and it was merged. Change subject: RESTBase: Remove purging config ......................................................................
RESTBase: Remove purging config Once If9bd7e2907986be944bd351b27a000cbb12f2448 gets out, RESTBase will not need to issue Varnish purge requests, so clean up the config. Note that this needs to get out in tandem with https://github.com/wikimedia/restbase/pull/621 and after If9bd7e2907986be944bd351b27a000cbb12f2448 . Change-Id: If50ef598bef64504016d57a56949751c855685fb Depends-On: If9bd7e2907986be944bd351b27a000cbb12f2448 --- M hieradata/labs/deployment-prep/common.yaml M modules/restbase/manifests/init.pp M modules/restbase/templates/config.labs.yaml.erb M modules/restbase/templates/config.yaml.erb 4 files changed, 4 insertions(+), 21 deletions(-) Approvals: Alexandros Kosiaris: 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 5dabb41..d7edbe9 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -112,7 +112,6 @@ restbase::mobileapps_uri: http://appservice.wmflabs.org restbase::mathoid_uri: http://deployment-mathoid.deployment-prep.eqiad.wmflabs:10042 restbase::aqs_uri: https://wikimedia.org/api/rest_v1/metrics -restbase::purge_host: deployment-cache-text04.deployment-prep.eqiad.wmflabs restbase::eventlogging_service_uri: http://deployment-eventlogging04.deployment-prep.eqiad.wmflabs:8085/v1/events "mediawiki::log_aggregator": deployment-fluorine.eqiad.wmflabs:8420 "mediawiki::forward_syslog": deployment-logstash2.deployment-prep.eqiad.wmflabs:10514 diff --git a/modules/restbase/manifests/init.pp b/modules/restbase/manifests/init.pp index 3e47d9b..dec0b62 100644 --- a/modules/restbase/manifests/init.pp +++ b/modules/restbase/manifests/init.pp @@ -69,12 +69,6 @@ # Analytics Query Service URI. Default: # http://aqs.svc.eqiad.wmnet:7232/analytics.wikimedia.org/v1 # -# [*purge_host*] -# The vhtcpd daemon host to send purge requests to. Default: 239.128.0.112 -# -# [*purge_port*] -# The port the vhtcp daemon listens to. Default: 4827 -# # [*eventlogging_service_uri*] # Eventlogging service URI. Default: http://eventbus.svc.eqiad.wmnet:8085/v1/events # @@ -110,8 +104,6 @@ $mathoid_uri = 'http://mathoid.svc.eqiad.wmnet:10042', $aqs_uri = 'http://aqs.svc.eqiad.wmnet:7232/analytics.wikimedia.org/v1', - $purge_host = '239.128.0.112', - $purge_port = 4827, $eventlogging_service_uri = 'http://eventbus.svc.eqiad.wmnet:8085/v1/events', $monitor_domain = 'en.wikipedia.org', diff --git a/modules/restbase/templates/config.labs.yaml.erb b/modules/restbase/templates/config.labs.yaml.erb index aa6ebaa..5191935 100644 --- a/modules/restbase/templates/config.labs.yaml.erb +++ b/modules/restbase/templates/config.labs.yaml.erb @@ -41,12 +41,8 @@ mobileapps: host: <%= @mobileapps_uri %> events: - purge: - host: <%= @purge_host %> - port: <%= @purge_port %> - eventlogging_service: - uri: <%= @eventlogging_service_uri %> - topic: resource_change + uri: <%= @eventlogging_service_uri %> + topic: resource_change related: cache_control: s-maxage=86400, max-age=86400 # Cache headers for purged end points. diff --git a/modules/restbase/templates/config.yaml.erb b/modules/restbase/templates/config.yaml.erb index 87c15fd..ce1c1eb 100644 --- a/modules/restbase/templates/config.yaml.erb +++ b/modules/restbase/templates/config.yaml.erb @@ -64,12 +64,8 @@ mobileapps: host: <%= @mobileapps_uri %> events: - purge: - host: <%= @purge_host %> - port: <%= @purge_port %> - eventlogging_service: - uri: <%= @eventlogging_service_uri %> - topic: resource_change + uri: <%= @eventlogging_service_uri %> + topic: resource_change related: cache_control: s-maxage=86400, max-age=3600 # Cache headers for purged end points. -- To view, visit https://gerrit.wikimedia.org/r/290786 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If50ef598bef64504016d57a56949751c855685fb Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Mobrovac <[email protected]> Gerrit-Reviewer: Alexandros Kosiaris <[email protected]> Gerrit-Reviewer: Filippo Giunchedi <[email protected]> Gerrit-Reviewer: GWicke <[email protected]> Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: Mobrovac <[email protected]> Gerrit-Reviewer: Ppchelko <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
