Filippo Giunchedi has submitted this change and it was merged. Change subject: Enable graphoid in labs & production ......................................................................
Enable graphoid in labs & production Depends on RESTBase deploy to make the public graphoid API spec available. Change-Id: Ia20ff1843d19b2db623057c18bab82df521f296f --- M hieradata/labs/restbase/common.yaml M hieradata/role/common/restbase.yaml M modules/restbase/manifests/init.pp M modules/restbase/templates/config.labs.yaml.erb M modules/restbase/templates/config.yaml.erb 5 files changed, 34 insertions(+), 2 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved Mobrovac: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/hieradata/labs/restbase/common.yaml b/hieradata/labs/restbase/common.yaml index 7c69d4a..b3c4924 100644 --- a/hieradata/labs/restbase/common.yaml +++ b/hieradata/labs/restbase/common.yaml @@ -2,3 +2,5 @@ - "localhost" logstash_port: 12201 logstash_host: "deployment-logstash1.eqiad.wmflabs" +# deployment-sca01 +graphoid_host_port: http://10.68.16.145:19000 diff --git a/hieradata/role/common/restbase.yaml b/hieradata/role/common/restbase.yaml index f55add8..30e83fe 100644 --- a/hieradata/role/common/restbase.yaml +++ b/hieradata/role/common/restbase.yaml @@ -14,6 +14,7 @@ restbase::cassandra_localDc: "%{::site}" restbase::statsd_host: statsd.eqiad.wmnet restbase::parsoid_uri: http://parsoid.svc.eqiad.wmnet:8000 +restbase::graphoid_host_port: http://graphoid.svc.eqiad.wmnet:19000 lvs::realserver::realserver_ips: - '10.2.2.17' # restbase.svc.eqiad.wmnet diff --git a/modules/restbase/manifests/init.pp b/modules/restbase/manifests/init.pp index 6fbf49f..3374828 100644 --- a/modules/restbase/manifests/init.pp +++ b/modules/restbase/manifests/init.pp @@ -34,6 +34,8 @@ # statsd host name. Default: localhost # [*statsd_port*] # statsd port. Default: 8125 +# [*graphoid_host_port*] +# graphoid host + port. Default: http://graphoid.svc.eqiad.wmnet:19000 # class restbase( $cassandra_user = 'cassandra', @@ -49,6 +51,7 @@ $logging_level = 'warn', $statsd_host = 'localhost', $statsd_port = '8125', + $graphoid_host_port = 'http://graphoid.svc.eqiad.wmnet:19000', ) { ensure_packages( ['nodejs', 'nodejs-legacy', 'npm'] ) diff --git a/modules/restbase/templates/config.labs.yaml.erb b/modules/restbase/templates/config.labs.yaml.erb index 925f93f..044d2f6 100644 --- a/modules/restbase/templates/config.labs.yaml.erb +++ b/modules/restbase/templates/config.labs.yaml.erb @@ -63,7 +63,7 @@ - user:read x-subspecs: - mediawiki/v1/content - # - mediawiki/v1/mobile + - mediawiki_v1_graphoid # - mediawiki/v1/revision-scoring wmf-sys-1.0.0: &wp/sys/1.0.0 @@ -124,6 +124,19 @@ options: apiURI: http://{domain}/w/api.php + /{module:graphoid}: + x-modules: + - name: simple_service + version: 1.0.0 + type: file + options: + paths: + /v1/png/{title}/{revision}/{graph_id}: + get: + backend_request: + # Default value: http://graphoid.svc.eqiad.wmnet:19000 + uri: <%= @graphoid_host_port %>/{domain}/v1/png/{title}/{revision}/{graph_id} + wp-default-1.0.0: &wp/default/1.0.0 x-subspecs: - paths: diff --git a/modules/restbase/templates/config.yaml.erb b/modules/restbase/templates/config.yaml.erb index 2b486fb..d771281 100644 --- a/modules/restbase/templates/config.yaml.erb +++ b/modules/restbase/templates/config.yaml.erb @@ -68,7 +68,7 @@ - user:read x-subspecs: - mediawiki/v1/content - # - mediawiki/v1/mobile + - mediawiki_v1_graphoid # - mediawiki/v1/revision-scoring wmf-sys-1.0.0: &wp/sys/1.0.0 @@ -145,6 +145,19 @@ options: apiURI: http://{domain}/w/api.php + /{module:graphoid}: + x-modules: + - name: simple_service + version: 1.0.0 + type: file + options: + paths: + /v1/png/{title}/{revision}/{graph_id}: + get: + backend_request: + # Default value: http://graphoid.svc.eqiad.wmnet:19000 + uri: <%= @graphoid_host_port %>/{domain}/v1/png/{title}/{revision}/{graph_id} + wp-default-1.0.0: &wp/default/1.0.0 x-subspecs: - paths: -- To view, visit https://gerrit.wikimedia.org/r/211758 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia20ff1843d19b2db623057c18bab82df521f296f Gerrit-PatchSet: 5 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: GWicke <gwi...@wikimedia.org> Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org> Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org> Gerrit-Reviewer: GWicke <gwi...@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
