Yuvipanda has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/240311

Change subject: elasticsearch: New role for labsearch cluster
......................................................................

elasticsearch: New role for labsearch cluster

Bug: T113282
Change-Id: I6955a2131d3aa1e425d1ced7ca481263f457ba1a
---
M hieradata/hosts/nobelium.yaml
M manifests/role/elasticsearch.pp
M manifests/site.pp
3 files changed, 12 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/11/240311/1

diff --git a/hieradata/hosts/nobelium.yaml b/hieradata/hosts/nobelium.yaml
index f922a35..6074d76 100644
--- a/hieradata/hosts/nobelium.yaml
+++ b/hieradata/hosts/nobelium.yaml
@@ -1,7 +1,3 @@
-cluster: labsearch
-
-# Only one node, gottabe master
-elasticsearch::master_eligible: true
-
-# Can run with only one master
-elasticsearch::minimum_master_nodes: 1
+# Root for all elasticsearch admins
+admin::groups:
+  - elasticsearch-roots
diff --git a/manifests/role/elasticsearch.pp b/manifests/role/elasticsearch.pp
index d62f13d..44ee461 100644
--- a/manifests/role/elasticsearch.pp
+++ b/manifests/role/elasticsearch.pp
@@ -87,3 +87,11 @@
         require => Package['elasticsearch'],
     }
 }
+
+# Role for the test labs replica of ElasticSearch
+class role::elasticsearch::labsearch {
+    class { '::elasticsearch':
+        cluster_name => 'labsearch',
+        heap_memory  => '30G',
+    }
+}
diff --git a/manifests/site.pp b/manifests/site.pp
index 7636410..b35d04c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2223,7 +2223,7 @@
 
 # Test server for labs ElasticSearch replication
 node 'nobelium.eqiad.wmnet' {
-    role elasticsearch::server
+    role elasticsearch::server::labsearch
     include base::firewall
     include standard
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/240311
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6955a2131d3aa1e425d1ced7ca481263f457ba1a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to