Cmjohnson has submitted this change and it was merged.
Change subject: Include and configure the restbase role on the test cluster
......................................................................
Include and configure the restbase role on the test cluster
Also set up the cassandra seeds in hiera, so that the cassandra cluster nodes
can find each other & aren't as lonely any more.
Since this is for internal testing only we leave out passwords & encryption
for now. Default cassandra passwords will be used.
Change-Id: I330a3b8487b647f0d7c22b28d823a5b4f858dd59
---
M hieradata/eqiad.yaml
M manifests/site.pp
2 files changed, 21 insertions(+), 0 deletions(-)
Approvals:
Cmjohnson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index c5e5a76..61b2143 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -15,3 +15,23 @@
- '10.64.0.193:11211:1'
- '10.64.0.194:11211:1'
- '10.64.0.195:11211:1'
+
+#
+# Cassandra test cluster for RESTBase
+cassandra::seeds:
+ - xenon.eqiad.wmnet
+ - cerium.eqiad.wmnet
+ - praseodymium.eqiad.wmnet
+
+#
+# RESTBase
+#
+# TODO: figure out a way to reference a cassandra cluster definition (see
+# above) directly without repeating it
+#
+restbase::seeds:
+ - xenon.eqiad.wmnet
+ - cerium.eqiad.wmnet
+ - praseodymium.eqiad.wmnet
+restbase::logstash_host: logstash1002.eqiad.wmnet
+restbase::cassandra_defaultConsistency: localQuorum
diff --git a/manifests/site.pp b/manifests/site.pp
index 28517d9..0d8c052 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -444,6 +444,7 @@
class { 'admin': groups => ['cassandra-roots'] }
include standard
include role::cassandra
+ include role::restbase
}
node /^(chromium|hydrogen)\.wikimedia\.org$/ {
--
To view, visit https://gerrit.wikimedia.org/r/175633
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I330a3b8487b647f0d7c22b28d823a5b4f858dd59
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: GWicke <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Cmjohnson <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
