Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/394490 )
Change subject: jobqueue_redis,restbase: remove ganglia
......................................................................
jobqueue_redis,restbase: remove ganglia
Bug: T177225
Change-Id: If3a26fc80743c681967b502ab04761cee792793b
---
M hieradata/role/common/jobqueue_redis/master.yaml
M hieradata/role/common/jobqueue_redis/slave.yaml
M hieradata/role/common/restbase/production.yaml
M hieradata/role/common/restbase/production_ng.yaml
M hieradata/role/common/restbase/test_cluster.yaml
5 files changed, 5 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/hieradata/role/common/jobqueue_redis/master.yaml
b/hieradata/role/common/jobqueue_redis/master.yaml
index f4d845f..e35ac70 100644
--- a/hieradata/role/common/jobqueue_redis/master.yaml
+++ b/hieradata/role/common/jobqueue_redis/master.yaml
@@ -1,4 +1,5 @@
cluster: redis
+standard::has_ganglia: false
profile::redis::multidc::category: jobqueue
profile::redis::multidc::discovery: "appservers-rw"
profile::redis::multidc::settings:
diff --git a/hieradata/role/common/jobqueue_redis/slave.yaml
b/hieradata/role/common/jobqueue_redis/slave.yaml
index 8c31ccd..d29c023 100644
--- a/hieradata/role/common/jobqueue_redis/slave.yaml
+++ b/hieradata/role/common/jobqueue_redis/slave.yaml
@@ -1,4 +1,5 @@
cluster: redis
+standard::has_ganglia: false
profile::redis::slave::settings:
bind: '0.0.0.0'
appendonly: true
diff --git a/hieradata/role/common/restbase/production.yaml
b/hieradata/role/common/restbase/production.yaml
index 709966c..644f9bf 100644
--- a/hieradata/role/common/restbase/production.yaml
+++ b/hieradata/role/common/restbase/production.yaml
@@ -2,6 +2,7 @@
# RESTBase
#
cluster: restbase
+standard::has_ganglia: false
profile::restbase::cassandra_local_dc: "%{::site}"
profile::restbase::logging_label: restbase
profile::restbase::cassandra_datacenters:
diff --git a/hieradata/role/common/restbase/production_ng.yaml
b/hieradata/role/common/restbase/production_ng.yaml
index 0cd5317..1ce05ff 100644
--- a/hieradata/role/common/restbase/production_ng.yaml
+++ b/hieradata/role/common/restbase/production_ng.yaml
@@ -1,5 +1,5 @@
cluster: restbase
-
+standard::has_ganglia: false
#
# Cassandra
#
diff --git a/hieradata/role/common/restbase/test_cluster.yaml
b/hieradata/role/common/restbase/test_cluster.yaml
index cb525f8..47a2779 100644
--- a/hieradata/role/common/restbase/test_cluster.yaml
+++ b/hieradata/role/common/restbase/test_cluster.yaml
@@ -1,4 +1,5 @@
cluster: restbase_test
+standard::has_ganglia: false
profile::restbase::cassandra_local_dc: "%{::site}"
profile::restbase::logging_label: restbase-test
profile::restbase::cassandra_datacenters:
--
To view, visit https://gerrit.wikimedia.org/r/394490
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If3a26fc80743c681967b502ab04761cee792793b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
