Yuvipanda has submitted this change and it was merged.
Change subject: Remove role::elasticsearch::config abstraction
......................................................................
Remove role::elasticsearch::config abstraction
It just makes this more confusing, isn't used outside of this
file, and makes it harder to consolidate things into heira
Change-Id: I7949c5333354fdafd5f23538b061061bade6e4fa
---
M manifests/role/elasticsearch.pp
1 file changed, 3 insertions(+), 10 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/elasticsearch.pp b/manifests/role/elasticsearch.pp
index b1588c6..a27a663 100644
--- a/manifests/role/elasticsearch.pp
+++ b/manifests/role/elasticsearch.pp
@@ -1,6 +1,6 @@
-# = Class: role::elasticsearch::config
+# = Class: role::elasticsearch::server
#
-# This class sets up Elasticsearch configuration in a WMF-specific way.
+# This class sets up Elasticsearch in a WMF-specific way.
#
@monitoring::group { 'elasticsearch_eqiad': description => 'eqiad
elasticsearch servers' }
@@ -8,7 +8,7 @@
@monitoring::group { 'elasticsearch_esams': description => 'esams
elasticsearch servers' }
@monitoring::group { 'elasticsearch_ulsfo': description => 'ulsfo
elasticsearch servers' }
-class role::elasticsearch::config {
+class role::elasticsearch::server {
# Config
if ($::realm == 'labs') {
$multicast_group = '224.2.2.4'
@@ -119,13 +119,6 @@
# only in production, no ganglia in beta
$use_ganglia = true
}
-}
-
-# = Class: role::elasticsearch::server
-#
-# This class sets up Elasticsearch in a WMF-specific way.
-#
-class role::elasticsearch::server inherits role::elasticsearch::config {
system::role { 'role::elasticsearch::server':
ensure => 'present',
--
To view, visit https://gerrit.wikimedia.org/r/188877
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7949c5333354fdafd5f23538b061061bade6e4fa
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: 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
