Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/369446 )
Change subject: RESTBase: Add the Recommendation API URI ...................................................................... RESTBase: Add the Recommendation API URI Bug: T170877 Change-Id: If3941b4326e51dcd8740d1fa3eef29d16728da2c --- M hieradata/labs/deployment-prep/common.yaml M hieradata/role/common/restbase/dev_cluster.yaml M hieradata/role/common/restbase/production.yaml M hieradata/role/common/restbase/test_cluster.yaml M modules/profile/manifests/restbase.pp 5 files changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/46/369446/1 diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index 71be5b1..9100395 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -113,6 +113,7 @@ profile::restbase::citoid_uri: http://deployment-sca02.deployment-prep.eqiad.wmflabs:1970 profile::restbase::trendingedits_uri: http://deployment-trending01.deployment-prep.eqiad.wmflabs:6699 profile::restbase::cxserver_uri: http://deployment-sca02.deployment-prep.eqiad.wmflabs:8080 +profile::restbase::recommendation_uri: http://deployment-sca01.deployment-prep.eqiad.wmflabs:9632 profile::restbase::cassandra_user: cassandra profile::restbase::cassandra_password: cassandra diff --git a/hieradata/role/common/restbase/dev_cluster.yaml b/hieradata/role/common/restbase/dev_cluster.yaml index b47652c..d1a5ee9 100644 --- a/hieradata/role/common/restbase/dev_cluster.yaml +++ b/hieradata/role/common/restbase/dev_cluster.yaml @@ -19,6 +19,7 @@ profile::restbase::trendingedits_uri: "http://trendingedits.svc.%{::site}.wmnet:6699"; profile::restbase::eventlogging_service_uri: "http://eventbus.discovery.wmnet:8085/v1/events"; profile::restbase::cxserver_uri: "http://cxserver.discovery.wmnet:8080"; +profile::restbase::recommendation_uri: "http://recommendation-api.discovery.wmnet:9632"; profile::restbase::cassandra_user: restb profile::restbase::cassandra_password: "%{passwords::cassandra::restbase}" profile::restbase::monitor_domain: en.wikipedia.org diff --git a/hieradata/role/common/restbase/production.yaml b/hieradata/role/common/restbase/production.yaml index 9bc84bb..82f3b2b 100644 --- a/hieradata/role/common/restbase/production.yaml +++ b/hieradata/role/common/restbase/production.yaml @@ -17,6 +17,7 @@ profile::restbase::trendingedits_uri: "http://trendingedits.svc.%{::site}.wmnet:6699"; profile::restbase::eventlogging_service_uri: "http://eventbus.discovery.wmnet:8085/v1/events"; profile::restbase::cxserver_uri: "http://cxserver.discovery.wmnet:8080"; +profile::restbase::recommendation_uri: "http://recommendation-api.discovery.wmnet:9632"; profile::restbase::cassandra_user: restb profile::restbase::cassandra_password: "%{passwords::cassandra::restbase}" profile::restbase::monitor_domain: en.wikipedia.org diff --git a/hieradata/role/common/restbase/test_cluster.yaml b/hieradata/role/common/restbase/test_cluster.yaml index f533e28..3a233be 100644 --- a/hieradata/role/common/restbase/test_cluster.yaml +++ b/hieradata/role/common/restbase/test_cluster.yaml @@ -17,6 +17,7 @@ profile::restbase::trendingedits_uri: "http://trendingedits.svc.%{::site}.wmnet:6699"; profile::restbase::eventlogging_service_uri: "http://eventbus.discovery.wmnet:8085/v1/events"; profile::restbase::cxserver_uri: "http://cxserver.discovery.wmnet:8080"; +profile::restbase::recommendation_uri: "http://recommendation-api.discovery.wmnet:9632"; profile::restbase::cassandra_user: restb profile::restbase::cassandra_password: "%{passwords::cassandra::restbase}" profile::restbase::monitor_domain: en.wikipedia.org diff --git a/modules/profile/manifests/restbase.pp b/modules/profile/manifests/restbase.pp index 8ddeebc..1df7ce3 100644 --- a/modules/profile/manifests/restbase.pp +++ b/modules/profile/manifests/restbase.pp @@ -64,6 +64,10 @@ # [*cxserver_uri*] # CXServer service uri. Format: http://cxserver.discovery.wmnet:8080 # +# [*recommendation_uri*] +# Recommendation API service URI. Format: +# http://recommendation-api.discovery.wmnet:9632 +# class profile::restbase( $cassandra_user = hiera('profile::restbase::cassandra_user'), @@ -85,6 +89,7 @@ $citoid_uri = hiera('profile::restbase::citoid_uri'), $trendingedits_uri = hiera('profile::restbase::trendingedits_uri'), $cxserver_uri = hiera('profile::restbase::cxserver_uri'), + $recommendation_uri = hiera('profile::restbase::recommendation_uri'), $monitor_domain = hiera('profile::restbase::monitor_domain'), ) { # Default values that need no overriding @@ -123,6 +128,7 @@ pdfrender_key => $pdfrender_key, trendingedits_uri => $trendingedits_uri, cxserver_uri => $cxserver_uri, + recommendation_uri => $recommendation_uri, aqs_uri => $aqs_uri, salt_key => $salt_key, page_size => $page_size, -- To view, visit https://gerrit.wikimedia.org/r/369446 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If3941b4326e51dcd8740d1fa3eef29d16728da2c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Mobrovac <mobro...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
