Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/238135
Change subject: cassandra: add auxiliary (non-seed) codfw test hosts
......................................................................
cassandra: add auxiliary (non-seed) codfw test hosts
not all nodes need (or want) to be seeds, yet they are part of the cluster and
should be allowed by firewall rules
Bug: T108613
Change-Id: I762dbc9c744bc1fecb9629e8837ad826c724efed
---
M hieradata/regex.yaml
M manifests/role/cassandra.pp
M modules/cassandra/manifests/init.pp
3 files changed, 12 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/35/238135/1
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index b667d0a..15c1acf 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -32,6 +32,10 @@
- cerium.eqiad.wmnet
- praseodymium.eqiad.wmnet
- xenon.eqiad.wmnet
+ cassandra::non_seeds:
+ - restbase-test2001.codfw.wmnet
+ - restbase-test2002.codfw.wmnet
+ - restbase-test2003.codfw.wmnet
restbase::seeds:
- cerium.eqiad.wmnet
- praseodymium.eqiad.wmnet
@@ -46,6 +50,10 @@
- cerium.eqiad.wmnet
- praseodymium.eqiad.wmnet
- xenon.eqiad.wmnet
+ cassandra::non_seeds:
+ - restbase-test2001.codfw.wmnet
+ - restbase-test2002.codfw.wmnet
+ - restbase-test2003.codfw.wmnet
restbase::seeds:
- cerium.eqiad.wmnet
- praseodymium.eqiad.wmnet
diff --git a/manifests/role/cassandra.pp b/manifests/role/cassandra.pp
index 4acd598..5808bf6 100644
--- a/manifests/role/cassandra.pp
+++ b/manifests/role/cassandra.pp
@@ -29,7 +29,9 @@
contact_group => 'admins,team-services',
}
- $cassandra_hosts = hiera('cassandra::seeds')
+ $cassandra_seeds = hiera('cassandra::seeds')
+ $cassandra_non_seeds = hiera('cassandra::non_seeds')
+ $cassandra_hosts = concat($cassandra_seeds, $cassandra_non_seeds)
$cassandra_hosts_ferm = join($cassandra_hosts, ' ')
# Cassandra intra-node messaging
diff --git a/modules/cassandra/manifests/init.pp
b/modules/cassandra/manifests/init.pp
index 91fb7bd..a9ed683 100644
--- a/modules/cassandra/manifests/init.pp
+++ b/modules/cassandra/manifests/init.pp
@@ -192,6 +192,7 @@
class cassandra(
$cluster_name = 'Test Cluster',
$seeds = [$::ipaddress],
+ $non_seeds = [],
$num_tokens = 256,
$authenticator = true,
$authorizor = true,
--
To view, visit https://gerrit.wikimedia.org/r/238135
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I762dbc9c744bc1fecb9629e8837ad826c724efed
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
