Dzahn has submitted this change and it was merged.
Change subject: cassandra: fix top-scope vars without namespaces
......................................................................
cassandra: fix top-scope vars without namespaces
./modules/cassandra/manifests/instance.pp
WARNING: top-scope variable being used without an explicit namespace on line 62
WARNING: top-scope variable being used without an explicit namespace on line 64
WARNING: top-scope variable being used without an explicit namespace on line 73
WARNING: top-scope variable being used without an explicit namespace on line 75
./modules/cassandra/manifests/init.pp
WARNING: top-scope variable being used without an explicit namespace on line 277
WARNING: top-scope variable being used without an explicit namespace on line 278
WARNING: top-scope variable being used without an explicit namespace on line 279
WARNING: top-scope variable being used without an explicit namespace on line 289
question: where is $initial_token being set? i don't see it anywhere, yet it
has to
set or why can puppet code validate it and not fail? it's commented out in the
erb template. is it correct that i use "cassandra::initial_token"? it's not
top-scope, right?
answer: see comments below, removing the line
Change-Id: I75467a9a335263123953e031828c23d0da2a6a89
---
M modules/cassandra/manifests/init.pp
M modules/cassandra/manifests/instance.pp
2 files changed, 7 insertions(+), 8 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
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..b25cece 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/266975
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I75467a9a335263123953e031828c23d0da2a6a89
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[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
