Eevans has uploaded a new change for review.
https://gerrit.wikimedia.org/r/238738
Change subject: configure datacenter set
......................................................................
configure datacenter set
T76494 requires a list of datacenters to be configured (one of which must
contain the `localDc').
Having this directive in place prior to the code that requires it won't hurt
anything (not having it after will).
Bug: T76494
Change-Id: I3f8a0cf6c25800d5ffd5187c69062dbc60e40b81
---
M hieradata/regex.yaml
M hieradata/role/common/restbase.yaml
M modules/restbase/manifests/init.pp
M modules/restbase/templates/config.yaml.erb
4 files changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/38/238738/1
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 368850b..5151339 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -42,6 +42,9 @@
- restbase-test2001.codfw.wmnet
- restbase-test2002.codfw.wmnet
- restbase-test2003.codfw.wmnet
+ restbase::cassandra_datacenters:
+ - eqiad
+ - codfw
cassandra::max_heap_size: 4g
cassandra::heap_newsize: 1g
cassandra::cluster_name: services-test
@@ -64,6 +67,9 @@
- restbase-test2001.codfw.wmnet
- restbase-test2002.codfw.wmnet
- restbase-test2003.codfw.wmnet
+ restbase::cassandra_datacenters:
+ - eqiad
+ - codfw
cassandra::max_heap_size: 4g
cassandra::heap_newsize: 1g
cassandra::cluster_name: services-test
diff --git a/hieradata/role/common/restbase.yaml
b/hieradata/role/common/restbase.yaml
index e0daa04..188b337 100644
--- a/hieradata/role/common/restbase.yaml
+++ b/hieradata/role/common/restbase.yaml
@@ -15,6 +15,8 @@
restbase::logstash_host: logstash1001.eqiad.wmnet
restbase::cassandra_defaultConsistency: localQuorum
restbase::cassandra_localDc: "%{::site}"
+restbase::cassandra_datacenters:
+ - "%{::site}"
restbase::statsd_host: statsd.eqiad.wmnet
restbase::parsoid_uri: http://parsoid.svc.eqiad.wmnet:8000
restbase::graphoid_uri: http://graphoid.svc.eqiad.wmnet:19000
diff --git a/modules/restbase/manifests/init.pp
b/modules/restbase/manifests/init.pp
index 3bb3955..b70d2f2 100644
--- a/modules/restbase/manifests/init.pp
+++ b/modules/restbase/manifests/init.pp
@@ -17,6 +17,8 @@
# 'localQuorum'. Default: 'localQuorum'.
# [*cassandra_localDc*]
# Which DC should be considered local. Default: 'datacenter1'.
+# [*cassandra_datacenters*]
+# The full list of member datacenters.
# [*port*]
# Port where to run the restbase service. Default: 7231
# [*config_template*]
@@ -45,6 +47,7 @@
$seeds = [$::ipaddress],
$cassandra_defaultConsistency = 'localQuorum',
$cassandra_localDc = 'datacenter1',
+ $cassandra_datacenters = [ 'datacenter1' ],
$port = 7231,
$salt_key = 'secretkey',
$page_size = 250,
diff --git a/modules/restbase/templates/config.yaml.erb
b/modules/restbase/templates/config.yaml.erb
index 9a1ace6..1df14cf 100644
--- a/modules/restbase/templates/config.yaml.erb
+++ b/modules/restbase/templates/config.yaml.erb
@@ -68,6 +68,7 @@
hosts: [<%= Array(@seeds).join(',') %>]
keyspace: system
localDc: <%= @cassandra_localDc %>
+ datacenters: [<%= Array(@cassandra_datacenters).join(',') %>]
username: <%= @cassandra_user %>
password: <%= @cassandra_password %>
defaultConsistency: <%= @cassandra_defaultConsistency %>
--
To view, visit https://gerrit.wikimedia.org/r/238738
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f8a0cf6c25800d5ffd5187c69062dbc60e40b81
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Eevans <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
