Dzahn has submitted this change and it was merged.
Change subject: set cassandra vars in cassandra.yaml, not restbase
......................................................................
set cassandra vars in cassandra.yaml, not restbase
set cassandra variables in cassandra.yaml, not in restbase.yaml
they just happen to be on the same boxes for now
Change-Id: Ied81257fff06789e9ab206d88273154802881732
---
M hieradata/role/common/cassandra.yaml
M hieradata/role/common/restbase.yaml
2 files changed, 19 insertions(+), 18 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, but someone else must approve
GWicke: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/hieradata/role/common/cassandra.yaml
b/hieradata/role/common/cassandra.yaml
index 65efa17..2ae48e2 100644
--- a/hieradata/role/common/cassandra.yaml
+++ b/hieradata/role/common/cassandra.yaml
@@ -1,2 +1,21 @@
cassandra::metrics::graphite_host: 'graphite-in.eqiad.wmnet'
cassandra::start_rpc: 'false'
+
+# TODO: set up a cluster variable similar to MySQL clusters to share
+# cassandra cluster configs between cassandra & clients
+
+cassandra::seeds:
+ - restbase1001.eqiad.wmnet
+ - restbase1002.eqiad.wmnet
+ - restbase1003.eqiad.wmnet
+ - restbase1004.eqiad.wmnet
+ - restbase1005.eqiad.wmnet
+ - restbase1006.eqiad.wmnet
+cassandra::max_heap_size: 8g
+cassandra::heap_newsize: 1200m
+cassandra::compaction_throughput_mb_per_sec: 160
+cassandra::concurrent_compactors: 10
+
+cassandra::dc: "%{::site}"
+cassandra::cluster_name: "%{::site}"
+
diff --git a/hieradata/role/common/restbase.yaml
b/hieradata/role/common/restbase.yaml
index 687a714..4d8fa1e 100644
--- a/hieradata/role/common/restbase.yaml
+++ b/hieradata/role/common/restbase.yaml
@@ -1,18 +1,3 @@
-# TODO: set up a cluster variable similar to MySQL clusters to share
-# cassandra cluster configs between cassandra & clients
-
-cassandra::seeds:
- - restbase1001.eqiad.wmnet
- - restbase1002.eqiad.wmnet
- - restbase1003.eqiad.wmnet
- - restbase1004.eqiad.wmnet
- - restbase1005.eqiad.wmnet
- - restbase1006.eqiad.wmnet
-cassandra::max_heap_size: 8g
-cassandra::heap_newsize: 1200m
-cassandra::compaction_throughput_mb_per_sec: 160
-cassandra::concurrent_compactors: 10
-
#
# RESTBase
#
@@ -31,9 +16,6 @@
lvs::realserver::realserver_ips:
- '10.2.2.17' # restbase.svc.eqiad.wmnet
-
-cassandra::dc: "%{::site}"
-cassandra::cluster_name: "%{::site}"
admin::groups:
- restbase-roots
--
To view, visit https://gerrit.wikimedia.org/r/201401
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ied81257fff06789e9ab206d88273154802881732
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Eevans <eev...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: GWicke <gwi...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
