Filippo Giunchedi has submitted this change and it was merged.
Change subject: cassandra: stop setting cluster_name as %{::site}
......................................................................
cassandra: stop setting cluster_name as %{::site}
Bug: T112257
Change-Id: I35dcc373f09197454a8d16e98716cc2cfbe5f39b
---
M hieradata/role/common/cassandra.yaml
M modules/cassandra/templates/cassandra.yaml.erb
2 files changed, 6 insertions(+), 1 deletion(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
Eevans: Looks good to me, but someone else must approve
Alexandros Kosiaris: Looks good to me, but someone else must approve
diff --git a/hieradata/role/common/cassandra.yaml
b/hieradata/role/common/cassandra.yaml
index 0c8f1e9..217bc07 100644
--- a/hieradata/role/common/cassandra.yaml
+++ b/hieradata/role/common/cassandra.yaml
@@ -31,7 +31,10 @@
cassandra::internode_encryption: dc
cassandra::dc: "%{::site}"
-cassandra::cluster_name: "%{::site}"
+# NOTE: this is cassandra's logical cluster name, not related to cassandra's
datacenters (eqiad/codfw)
+# it used to be defined as "%{::site}" and thus the first cassandra cluster
has been named "eqiad"
+# see also https://phabricator.wikimedia.org/T112257#1663467 for full context
+cassandra::cluster_name: "eqiad"
cassandra::application_username: restbase
cassandra::application_password: "%{passwords::cassandra::restbase}"
diff --git a/modules/cassandra/templates/cassandra.yaml.erb
b/modules/cassandra/templates/cassandra.yaml.erb
index 6bf31e8..bbcdb48 100644
--- a/modules/cassandra/templates/cassandra.yaml.erb
+++ b/modules/cassandra/templates/cassandra.yaml.erb
@@ -9,6 +9,8 @@
# The name of the cluster. This is mainly used to prevent machines in
# one logical cluster from joining another.
+# NOTE: this is not related to datacenter name, a single cassandra cluster can
+# span multiple datacenters.
cluster_name: '<%= @cluster_name %>'
# This defines the number of tokens randomly assigned to this node on the ring
--
To view, visit https://gerrit.wikimedia.org/r/240321
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I35dcc373f09197454a8d16e98716cc2cfbe5f39b
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Eevans <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
