Smalyshev has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/328582 )
Change subject: Add configuration for query endpoint URL ...................................................................... Add configuration for query endpoint URL Bug: T153897 Change-Id: I2312b1c138175d8c1f0fbb9d103a9e9dd949bffa --- M hieradata/labs/wikidata-query/common.yaml M hieradata/role/common/wdqs.yaml M modules/wdqs/manifests/init.pp M modules/wdqs/templates/vars.yaml.erb 4 files changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/82/328582/1 diff --git a/hieradata/labs/wikidata-query/common.yaml b/hieradata/labs/wikidata-query/common.yaml index 10e0830..8553ccf 100644 --- a/hieradata/labs/wikidata-query/common.yaml +++ b/hieradata/labs/wikidata-query/common.yaml @@ -3,4 +3,5 @@ "wdqs::use_git_deploy": false "wdqs::package_dir": '/srv/wdqs/blazegraph' "wdqs::data_dir": '/srv/wdqs/blazegraph' +"wdqs::endpoint": '' diff --git a/hieradata/role/common/wdqs.yaml b/hieradata/role/common/wdqs.yaml index 3e9e5d0..be3590b 100644 --- a/hieradata/role/common/wdqs.yaml +++ b/hieradata/role/common/wdqs.yaml @@ -1,6 +1,7 @@ wdqs::gui::log_aggregator: 'logstash1001.eqiad.wmnet:10514' wdqs::updater::options: '-n wdq -- -b 500' wdqs::service::config_file: /etc/wdqs/RWStore.properties +wdqs::endpoint: 'https://query.wikidata.org' admin::groups: - wdqs-admins cluster: wdqs diff --git a/modules/wdqs/manifests/init.pp b/modules/wdqs/manifests/init.pp index c1da181..a296454 100644 --- a/modules/wdqs/manifests/init.pp +++ b/modules/wdqs/manifests/init.pp @@ -8,12 +8,14 @@ # - $package_dir: Directory where the service should be installed. # - $data_dir: Directory where the database should be stored # - $log_dir: Directory where the logs go +# - $endpoint: External endpoint name class wdqs( $use_git_deploy = true, $username = 'blazegraph', $package_dir = '/srv/deployment/wdqs/wdqs', $data_dir = '/var/lib/wdqs', $log_dir = '/var/log/wdqs', + $endpoint = '', ) { $deploy_user = 'deploy-service' diff --git a/modules/wdqs/templates/vars.yaml.erb b/modules/wdqs/templates/vars.yaml.erb index f65c330..3ba5b15 100644 --- a/modules/wdqs/templates/vars.yaml.erb +++ b/modules/wdqs/templates/vars.yaml.erb @@ -1,2 +1,3 @@ --- data_dir: <%= @data_dir %> +endpoint: <%= @endpoint %> -- To view, visit https://gerrit.wikimedia.org/r/328582 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2312b1c138175d8c1f0fbb9d103a9e9dd949bffa Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Smalyshev <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
