Mobrovac has uploaded a new change for review.
https://gerrit.wikimedia.org/r/270005
Change subject: Cassandra: fix top-scope vars without namespaces
......................................................................
Cassandra: fix top-scope vars without namespaces
This is a do-over of I75467a9a335263123953e031828c23d0da2a6a89 (which
got reverted). The pitfall was in making instance_name a top-scope
variable, but it isn't - it's local to the ::cassandra::instance define.
This commit also removes the validation of $initial_token inside the
cassandra class, since it's not declared nor used anywhere.
Bug: T125943
Change-Id: I901a667bf21d092f1d7865c4118c81f63969a58e
---
M modules/cassandra/manifests/init.pp
M modules/cassandra/manifests/instance.pp
2 files changed, 7 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/05/270005/1
diff --git a/modules/cassandra/manifests/init.pp
b/modules/cassandra/manifests/init.pp
index 17d4a46..03b1b0a 100644
--- a/modules/cassandra/manifests/init.pp
+++ b/modules/cassandra/manifests/init.pp
@@ -274,9 +274,9 @@
$application_password = undef,
$auto_bootstrap = true,
- $yaml_template = "${module}/cassandra.yaml.erb",
- $env_template = "${module}/cassandra-env.sh.erb",
- $rackdc_template =
"${module}/cassandra-rackdc.properties.erb",
+ $yaml_template = "${::module}/cassandra.yaml.erb",
+ $env_template = "${::module}/cassandra-env.sh.erb",
+ $rackdc_template =
"${::module}/cassandra-rackdc.properties.erb",
$logstash_host = 'logstash1003.eqiad.wmnet',
$logstash_port = 11514,
@@ -286,7 +286,6 @@
validate_absolute_path($commitlog_directory)
validate_absolute_path($saved_caches_directory)
- validate_string($initial_token)
validate_string($endpoint_snitch)
validate_re($rpc_server_type, '^(hsha|sync|async)$')
diff --git a/modules/cassandra/manifests/instance.pp
b/modules/cassandra/manifests/instance.pp
index 6dd6119..f1e8ee4 100644
--- a/modules/cassandra/manifests/instance.pp
+++ b/modules/cassandra/manifests/instance.pp
@@ -59,9 +59,9 @@
$data_directory_base = '/var/lib/cassandra'
$config_directory = '/etc/cassandra'
$service_name = 'cassandra'
- $tls_hostname = $hostname
+ $tls_hostname = $::hostname
$pid_file = '/var/run/cassandra/cassandra.pid'
- $instance_id = $hostname
+ $instance_id = $::hostname
$data_file_directories = $this_instance['data_file_directories']
$commitlog_directory = $this_instance['commitlog_directory']
$heapdump_directory = $this_instance['heapdump_directory']
@@ -70,9 +70,9 @@
$data_directory_base = "/srv/cassandra-${instance_name}"
$config_directory = "/etc/cassandra-${instance_name}"
$service_name = "cassandra-${instance_name}"
- $tls_hostname = "${hostname}-${instance_name}"
+ $tls_hostname = "${::hostname}-${instance_name}"
$pid_file =
"/var/run/cassandra/cassandra-${instance_name}.pid"
- $instance_id = "${hostname}-${instance_name}"
+ $instance_id = "${::hostname}-${instance_name}"
$data_file_directories = ["${data_directory_base}/data"]
$commitlog_directory = "${data_directory_base}/commitlog"
$heapdump_directory = $data_directory_base
--
To view, visit https://gerrit.wikimedia.org/r/270005
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I901a667bf21d092f1d7865c4118c81f63969a58e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
