Tim Landscheidt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/278295
Change subject: Fix misleading/not supported variable references
......................................................................
Fix misleading/not supported variable references
Puppet uses the syntax "${variable}" to refer to variables' contents
in strings
(cf.
http://docs.puppetlabs.com/puppet/3/reference/lang_variables.html#interpolation).
It also silently allows the syntax "${$variable}" with the same
semantics, but this can be misleading to users who expect a double
interpolation there (i. e., they expect that this expression expands
to the content of the variable with the name that $variable contains).
This change replaces those uses of "${$variable}" with the supported
syntax "${variable}".
Change-Id: I76a0cdcc0c218a106c662f229e37abada5dcf10d
---
M modules/camus/manifests/job.pp
M modules/openstack/manifests/common.pp
M modules/openstack/manifests/designate/service.pp
M modules/openstack/manifests/glance/service.pp
M modules/openstack/manifests/horizon/service.pp
M modules/openstack/manifests/nova/network.pp
M modules/reportupdater/manifests/job.pp
M modules/role/manifests/analytics_cluster/refinery/data/check.pp
8 files changed, 15 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/95/278295/1
diff --git a/modules/camus/manifests/job.pp b/modules/camus/manifests/job.pp
index 223e66d..797f0be 100644
--- a/modules/camus/manifests/job.pp
+++ b/modules/camus/manifests/job.pp
@@ -35,7 +35,7 @@
# Any additional jar files to pass to Hadoop when starting the MapReduce
job.
#
# [*template*]
-# Puppet path to camus.properties ERb template. Default: camus/{$title}.erb
+# Puppet path to camus.properties ERb template. Default: camus/${title}.erb
#
# [*template_variables*]
# Hash of anything you might need accesible in your custom camus.properties
diff --git a/modules/openstack/manifests/common.pp
b/modules/openstack/manifests/common.pp
index 9fa7ebd..505eec0 100644
--- a/modules/openstack/manifests/common.pp
+++ b/modules/openstack/manifests/common.pp
@@ -34,13 +34,13 @@
file {
'/etc/nova/nova.conf':
- content =>
template("openstack/${$openstack_version}/nova/nova.conf.erb"),
+ content =>
template("openstack/${openstack_version}/nova/nova.conf.erb"),
owner => 'nova',
group => 'nogroup',
mode => '0440',
require => Package['nova-common'];
'/etc/nova/api-paste.ini':
- content =>
template("openstack/${$openstack_version}/nova/api-paste.ini.erb"),
+ content =>
template("openstack/${openstack_version}/nova/api-paste.ini.erb"),
owner => 'nova',
group => 'nogroup',
mode => '0440',
diff --git a/modules/openstack/manifests/designate/service.pp
b/modules/openstack/manifests/designate/service.pp
index 64e485d..772740b 100644
--- a/modules/openstack/manifests/designate/service.pp
+++ b/modules/openstack/manifests/designate/service.pp
@@ -40,21 +40,21 @@
require => Package['designate-common'],
mode => '0440';
'/etc/designate/api-paste.ini':
- content =>
template("openstack/${$openstack_version}/designate/api-paste.ini.erb"),
+ content =>
template("openstack/${openstack_version}/designate/api-paste.ini.erb"),
owner => 'designate',
group => 'designate',
notify =>
Service['designate-api','designate-sink','designate-central'],
require => Package['designate-api'],
mode => '0440';
'/etc/designate/policy.json':
- source =>
"puppet:///modules/openstack/${$openstack_version}/designate/policy.json",
+ source =>
"puppet:///modules/openstack/${openstack_version}/designate/policy.json",
owner => 'designate',
group => 'designate',
notify =>
Service['designate-api','designate-sink','designate-central'],
require => Package['designate-common'],
mode => '0440';
'/etc/designate/rootwrap.conf':
- source =>
"puppet:///modules/openstack/${$openstack_version}/designate/rootwrap.conf",
+ source =>
"puppet:///modules/openstack/${openstack_version}/designate/rootwrap.conf",
owner => 'root',
group => 'root',
notify =>
Service['designate-api','designate-sink','designate-central'],
diff --git a/modules/openstack/manifests/glance/service.pp
b/modules/openstack/manifests/glance/service.pp
index 7e9f868..668c340 100644
--- a/modules/openstack/manifests/glance/service.pp
+++ b/modules/openstack/manifests/glance/service.pp
@@ -55,14 +55,14 @@
file {
'/etc/glance/glance-api.conf':
- content =>
template("openstack/${$openstack_version}/glance/glance-api.conf.erb"),
+ content =>
template("openstack/${openstack_version}/glance/glance-api.conf.erb"),
owner => 'glance',
group => nogroup,
notify => Service['glance-api'],
require => Package['glance'],
mode => '0440';
'/etc/glance/glance-registry.conf':
- content =>
template("openstack/${$openstack_version}/glance/glance-registry.conf.erb"),
+ content =>
template("openstack/${openstack_version}/glance/glance-registry.conf.erb"),
owner => 'glance',
group => nogroup,
notify => Service['glance-registry'],
diff --git a/modules/openstack/manifests/horizon/service.pp
b/modules/openstack/manifests/horizon/service.pp
index c150333..4d2debc 100644
--- a/modules/openstack/manifests/horizon/service.pp
+++ b/modules/openstack/manifests/horizon/service.pp
@@ -41,7 +41,7 @@
}
file { '/etc/openstack-dashboard/local_settings.py':
- content =>
template("openstack/${$openstack_version}/horizon/local_settings.py.erb"),
+ content =>
template("openstack/${openstack_version}/horizon/local_settings.py.erb"),
owner => 'horizon',
group => 'horizon',
notify => Service['apache2'],
@@ -192,7 +192,7 @@
}
apache::site { $webserver_hostname:
- content =>
template("openstack/${$openstack_version}/horizon/${webserver_hostname}.erb"),
+ content =>
template("openstack/${openstack_version}/horizon/${webserver_hostname}.erb"),
require => File['/etc/openstack-dashboard/local_settings.py'],
}
}
diff --git a/modules/openstack/manifests/nova/network.pp
b/modules/openstack/manifests/nova/network.pp
index 19b2dc3..935c1a1 100644
--- a/modules/openstack/manifests/nova/network.pp
+++ b/modules/openstack/manifests/nova/network.pp
@@ -50,7 +50,7 @@
$labs_metal = hiera('labs_metal',{})
$recursor_ip = ipresolve($dnsconfig['recursor'],4)
file { '/etc/dnsmasq-nova.conf':
- content =>
template("openstack/${$openstack_version}/nova/dnsmasq-nova.conf.erb"),
+ content =>
template("openstack/${openstack_version}/nova/dnsmasq-nova.conf.erb"),
owner => 'root',
group => 'root',
mode => '0444',
diff --git a/modules/reportupdater/manifests/job.pp
b/modules/reportupdater/manifests/job.pp
index 6ebcbb1..47f7941 100644
--- a/modules/reportupdater/manifests/job.pp
+++ b/modules/reportupdater/manifests/job.pp
@@ -46,7 +46,7 @@
$query_path = "${path}/${title}"
# Path at which the job will store logs.
- $log_file =
"${$::reportupdater::log_path}/${repository}-${title}.log"
+ $log_file =
"${::reportupdater::log_path}/${repository}-${title}.log"
# Path at which the job will store its report output.
$output_path = "${::reportupdater::output_path}/${output_dir}"
diff --git a/modules/role/manifests/analytics_cluster/refinery/data/check.pp
b/modules/role/manifests/analytics_cluster/refinery/data/check.pp
index 55d5d49..46ab358 100644
--- a/modules/role/manifests/analytics_cluster/refinery/data/check.pp
+++ b/modules/role/manifests/analytics_cluster/refinery/data/check.pp
@@ -20,7 +20,7 @@
# the cron runs as hdfs instead.
cron { 'refinery data check hdfs_mount':
command =>
"${::role::analytics_cluster::refinery::path}/bin/refinery-dump-status-webrequest-partitions
--hdfs-mount ${hdfs_mount_point} --datasets webrequest,raw_webrequest --quiet
--percent-lost",
- environment => "MAILTO=${$mail_to}",
+ environment => "MAILTO=${mail_to}",
user => 'hdfs',
hour => 10,
minute => 0,
@@ -28,7 +28,7 @@
cron { 'refinery data check pagecounts':
command =>
"${::role::analytics_cluster::refinery::path}/bin/refinery-dump-status-webrequest-partitions
--hdfs-mount ${hdfs_mount_point} --datasets
pagecounts_all_sites,pagecounts_raw --quiet",
- environment => "MAILTO=${$mail_to}",
+ environment => "MAILTO=${mail_to}",
user => 'hdfs', # See comment in above cron
hour => 10,
minute => 5,
@@ -36,7 +36,7 @@
cron { 'refinery data check pageviews':
command =>
"${::role::analytics_cluster::refinery::path}/bin/refinery-dump-status-webrequest-partitions
--hdfs-mount ${hdfs_mount_point} --datasets pageview,projectview --quiet",
- environment => "MAILTO=${$mail_to}",
+ environment => "MAILTO=${mail_to}",
user => 'hdfs', # See comment in first cron above
hour => 10,
minute => 10,
--
To view, visit https://gerrit.wikimedia.org/r/278295
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I76a0cdcc0c218a106c662f229e37abada5dcf10d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
