Gehel has submitted this change and it was merged.
Change subject: Update configuration for elasticsearch 2.3 upgrade on eqiad
......................................................................
Update configuration for elasticsearch 2.3 upgrade on eqiad
* bind_networks to _local_ and _site_
* publish_host _eth0_
* update mandatory plugins
Bug: T133126
Change-Id: I71fa30ecd6453dfd1d064aaf9cb76bb7d2fae64d
---
M hieradata/labs/deployment-prep/common.yaml
M hieradata/role/codfw/elasticsearch/server.yaml
M hieradata/role/common/elasticsearch/server.yaml
3 files changed, 8 insertions(+), 15 deletions(-)
Approvals:
Gehel: Looks good to me, approved
DCausse: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/hieradata/labs/deployment-prep/common.yaml
b/hieradata/labs/deployment-prep/common.yaml
index f160014..629be2d 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -178,9 +178,6 @@
- deployment-elastic06
- deployment-elastic07
- deployment-elastic08
-"elasticsearch::bind_networks":
- - _local_
- - _site_
"elasticsearch::cluster_name": beta-search
"elasticsearch::auto_create_index": '+apifeatureusage-*,-*'
"elasticsearch::graylog_hosts":
diff --git a/hieradata/role/codfw/elasticsearch/server.yaml
b/hieradata/role/codfw/elasticsearch/server.yaml
index 32945f7..5fde83b 100644
--- a/hieradata/role/codfw/elasticsearch/server.yaml
+++ b/hieradata/role/codfw/elasticsearch/server.yaml
@@ -9,17 +9,6 @@
- elastic2007.codfw.wmnet
- elastic2013.codfw.wmnet
-elasticsearch::bind_networks:
- - _local_
- - _site_
-
-elasticsearch::publish_host: _eth0_
-
-elasticsearch::plugins_mandatory:
- - 'experimental-highlighter'
- - 'extra'
- - 'analysis-icu'
-
lvs::realserver::realserver_ips: "10.2.1.30"
elasticsearch::cluster_hosts:
diff --git a/hieradata/role/common/elasticsearch/server.yaml
b/hieradata/role/common/elasticsearch/server.yaml
index 8593838..00e37b7 100644
--- a/hieradata/role/common/elasticsearch/server.yaml
+++ b/hieradata/role/common/elasticsearch/server.yaml
@@ -12,11 +12,18 @@
# More than 30G isn't very useful
elasticsearch::heap_memory: '30G'
+elasticsearch::bind_networks:
+ - _local_
+ - _site_
+
+elasticsearch::publish_host: _eth0_
+
# Production elasticsearch needs these plugins to be loaded in order
# to work properly. This will keep elasticsearch from starting
# if these plugins are not available.
elasticsearch::plugins_mandatory:
- - 'experimental highlighter'
+ - 'experimental-highlighter'
+ - 'extra'
- 'analysis-icu'
# But it'd save time if we just waited for all of them to come back so
--
To view, visit https://gerrit.wikimedia.org/r/292541
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I71fa30ecd6453dfd1d064aaf9cb76bb7d2fae64d
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: DCausse <dcau...@wikimedia.org>
Gerrit-Reviewer: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
