Gehel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/349222 )
Change subject: elasticsearch - stop using experimental apt repository ...................................................................... elasticsearch - stop using experimental apt repository elasticsearch has been moved to thirdparty now that only logstash needs to be upgraded Change-Id: I980adc9470cc6d1e071c0864aac64b150353c3b4 --- M hieradata/role/common/elasticsearch/cirrus.yaml M hieradata/role/common/elasticsearch/relforge.yaml 2 files changed, 0 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/22/349222/1 diff --git a/hieradata/role/common/elasticsearch/cirrus.yaml b/hieradata/role/common/elasticsearch/cirrus.yaml index b87a723..bbfab05 100644 --- a/hieradata/role/common/elasticsearch/cirrus.yaml +++ b/hieradata/role/common/elasticsearch/cirrus.yaml @@ -20,11 +20,6 @@ profile::elasticsearch::ferm_srange: '$DOMAIN_NETWORKS' -# use elasticsearch 5, which is only available in experimental at the moment. -# 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 - # mwgrep queries one copy of each shard in the cluster, which is currently just # over 3k shards. For it to work we need to increase the limit from default 1k elasticsearch::search_shard_count_limit: 5000 diff --git a/hieradata/role/common/elasticsearch/relforge.yaml b/hieradata/role/common/elasticsearch/relforge.yaml index 49076f9..6672ad3 100644 --- a/hieradata/role/common/elasticsearch/relforge.yaml +++ b/hieradata/role/common/elasticsearch/relforge.yaml @@ -11,8 +11,3 @@ # T130329 profile::base::check_disk_options: -w 18% -c 15% -l -e -A -i "/srv/sd[a-b][1-3]" --exclude-type=tracefs - -# use elasticsearch 5, which is only available in experimental at the moment. -# 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 -- To view, visit https://gerrit.wikimedia.org/r/349222 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I980adc9470cc6d1e071c0864aac64b150353c3b4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Gehel <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
