Yuvipanda has submitted this change and it was merged.
Change subject: Move beta elasticsearch config into hiera
......................................................................
Move beta elasticsearch config into hiera
Change-Id: I3998769c4ac5b135237ee1e15173c4d48b13180b
---
M hieradata/labs/deployment-prep/common.yaml
M manifests/role/elasticsearch.pp
2 files changed, 16 insertions(+), 15 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/labs/deployment-prep/common.yaml
b/hieradata/labs/deployment-prep/common.yaml
index 464a244..b45f03e 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -118,3 +118,18 @@
"mediawiki::users::web": www-data
"beta::syncsiteresources::user": www-data
"role::url_downloader::url_downloader_ip": 10.68.16.135
+"role::elasticsearch::server":
+ # Has four nodes all of which can be master
+ minimum_master_nodes: 3
+ recover_after_time: '1m'
+ cluster_name: 'beta-search'
+ heap_memory: '4G'
+ expected_nodes: 4
+ # The cluster can limp along just fine with three nodes so we'll let it
+ recover_after_nodes: 3
+ statsd_host: 'labmon1001.eqiad.wmnet'
+ unicast_hosts:
+ - deployment-elastic05
+ - deployment-elastic06
+ - deployment-elastic07
+ - deployment-elastic08
diff --git a/manifests/role/elasticsearch.pp b/manifests/role/elasticsearch.pp
index 4549a68..8a2dc75 100644
--- a/manifests/role/elasticsearch.pp
+++ b/manifests/role/elasticsearch.pp
@@ -22,21 +22,7 @@
$bulk_thread_pool_capacity = undef
$bulk_thread_pool_executors = undef
$use_ganglia = false
- if ($::hostname =~ /^deployment-/) {
- # Beta
- # Has four nodes all of which can be master
- $minimum_master_nodes = 3
- $cluster_name = 'beta-search'
- $heap_memory = '4G'
- $expected_nodes = 4
- # The cluster can limp along just fine with three nodes so we'll
- # let it
- $recover_after_nodes = 3
- $unicast_hosts = ['deployment-elastic05',
- 'deployment-elastic06', 'deployment-elastic07',
- 'deployment-elastic08']
- $statsd_host = 'labmon1001.eqiad.wmnet'
- } else {
+ if (! $::hostname =~ /^deployment-/) {
# Regular labs instance
# We don't know how many instances will be in each labs project so
# we got with the lowest common denominator assuming that you can
--
To view, visit https://gerrit.wikimedia.org/r/188702
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3998769c4ac5b135237ee1e15173c4d48b13180b
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
