Chad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/207140
Change subject: Elastic: move auto_create_index into hiera instead of role
......................................................................
Elastic: move auto_create_index into hiera instead of role
Change-Id: Ibd58670e17c65817dd36986c88f5d6e8a2f86ff8
---
M hieradata/labs/deployment-prep/common.yaml
M hieradata/labs/staging/common.yaml
M hieradata/role/common/elasticsearch/server.yaml
M manifests/role/elasticsearch.pp
4 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/40/207140/1
diff --git a/hieradata/labs/deployment-prep/common.yaml
b/hieradata/labs/deployment-prep/common.yaml
index 9d543a9..8bc18db 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -250,3 +250,4 @@
- deployment-elastic07
- deployment-elastic08
"elasticsearch::cluster_name": beta-search
+"elasticsearch::auto_create_index": '+apifeatureusage-*,-*'
diff --git a/hieradata/labs/staging/common.yaml
b/hieradata/labs/staging/common.yaml
index dd37d87..ac93afe 100644
--- a/hieradata/labs/staging/common.yaml
+++ b/hieradata/labs/staging/common.yaml
@@ -19,3 +19,4 @@
- staging-elastic02
- staging-elastic03
- staging-elastic04
+elasticsearch::auto_create_index: '+apifeatureusage-*,-*'
diff --git a/hieradata/role/common/elasticsearch/server.yaml
b/hieradata/role/common/elasticsearch/server.yaml
index c549daf..87f1136 100644
--- a/hieradata/role/common/elasticsearch/server.yaml
+++ b/hieradata/role/common/elasticsearch/server.yaml
@@ -34,6 +34,5 @@
elasticsearch::bulk_thread_pool_capacity: 1000
elasticsearch::bulk_thread_pool_executors: 6
-
-
-
+# Let apifeatureusage create their indices
+elasticsearch::auto_create_index: '+apifeatureusage-*,-*'
diff --git a/manifests/role/elasticsearch.pp b/manifests/role/elasticsearch.pp
index 7c5832f..8d5feb9 100644
--- a/manifests/role/elasticsearch.pp
+++ b/manifests/role/elasticsearch.pp
@@ -39,7 +39,6 @@
class { '::elasticsearch':
plugins_dir => '/srv/deployment/elasticsearch/plugins',
require => Package['elasticsearch/plugins'],
- auto_create_index => '+apifeatureusage-*,-*',
merge_threads => 1,
}
--
To view, visit https://gerrit.wikimedia.org/r/207140
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd58670e17c65817dd36986c88f5d6e8a2f86ff8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
