EBernhardson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/344517 )
Change subject: Allow search clusters to reindex from eachother ...................................................................... Allow search clusters to reindex from eachother Whitelists the following potential reindex source/destinations with the elasticsearch reindex API: * codfw -> eqiad * codfw -> relforge * eqiad -> codfw * eqiad -> relforge Change-Id: I2670f5a5fbaa2940a84e7bb20b5ce66856edc7ce --- M hieradata/role/codfw/elasticsearch/cirrus.yaml M hieradata/role/common/elasticsearch/relforge.yaml M hieradata/role/eqiad/elasticsearch/cirrus.yaml M modules/elasticsearch/templates/elasticsearch_5.yml.erb 4 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/17/344517/1 diff --git a/hieradata/role/codfw/elasticsearch/cirrus.yaml b/hieradata/role/codfw/elasticsearch/cirrus.yaml index cd68fb5..ea3f184 100644 --- a/hieradata/role/codfw/elasticsearch/cirrus.yaml +++ b/hieradata/role/codfw/elasticsearch/cirrus.yaml @@ -63,3 +63,6 @@ elasticsearch::https::certificate_name: 'search.svc.codfw.wmnet' profile::base::dns_alt_names: 'search.svc.codfw.wmnet' + +# Allow reindex from eqiad to codfw +elasticsearch::reindex_remote_whitelist: 'search.svc.eqiad.wmnet:9200' diff --git a/hieradata/role/common/elasticsearch/relforge.yaml b/hieradata/role/common/elasticsearch/relforge.yaml index f2138f7..086ec0c 100644 --- a/hieradata/role/common/elasticsearch/relforge.yaml +++ b/hieradata/role/common/elasticsearch/relforge.yaml @@ -17,3 +17,6 @@ # once all elasticsearch clusters are upgraded to version 5, we will move # elasticsearch to our main repo and remove this configuration apt::use_experimental: true + +# Allow reindex from eqiad or codfw to relforge +elasticsearch::reindex_remote_whitelist: 'search.svc.eqiad.wmnet:9200,search.svc.codfw.wmnet:9200' diff --git a/hieradata/role/eqiad/elasticsearch/cirrus.yaml b/hieradata/role/eqiad/elasticsearch/cirrus.yaml index 65765c2..dce74b2 100644 --- a/hieradata/role/eqiad/elasticsearch/cirrus.yaml +++ b/hieradata/role/eqiad/elasticsearch/cirrus.yaml @@ -64,3 +64,6 @@ elasticsearch::https::certificate_name: 'search.svc.eqiad.wmnet' profile::base::dns_alt_names: 'search.svc.eqiad.wmnet' + +# Allow reindex from eqiad to codfw +elasticsearch::reindex_remote_whitelist: 'search.svc.codfw.wmnet:9200' diff --git a/modules/elasticsearch/templates/elasticsearch_5.yml.erb b/modules/elasticsearch/templates/elasticsearch_5.yml.erb index 87aea61..e2d0bc9 100644 --- a/modules/elasticsearch/templates/elasticsearch_5.yml.erb +++ b/modules/elasticsearch/templates/elasticsearch_5.yml.erb @@ -426,3 +426,9 @@ index.load_fixed_bitset_filters_eagerly: false <% end -%> + +## +# Hosts allowed as data sources for reindexing +<% if reindex_remote_whitelist %> +reindex.remote.whitelist: "<%= @reindex_remote_whitelist %>" +<% end %> -- To view, visit https://gerrit.wikimedia.org/r/344517 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2670f5a5fbaa2940a84e7bb20b5ce66856edc7ce Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
