[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r373: Add curly braces to fix variable name ambiguity with Puppet 2.7.
Jeff Licquia
licquia at linuxfoundation.org
Sun Dec 30 23:35:36 UTC 2012
------------------------------------------------------------
revno: 373
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Sun 2012-12-30 18:35:36 -0500
message:
Add curly braces to fix variable name ambiguity with Puppet 2.7.
modified:
modules/alien/manifests/init.pp
modules/buildbot/manifests/master.pp
modules/buildbot/manifests/slave.pp
modules/buildbot/manifests/slavepkgs.pp
modules/bzr/manifests/init.pp
modules/php/manifests/init.pp
modules/puppet/manifests/init.pp
modules/python/manifests/virtualenv.pp
modules/sudo/manifests/init.pp
-------------- next part --------------
=== modified file 'modules/alien/manifests/init.pp'
--- a/modules/alien/manifests/init.pp 2012-12-13 16:38:30 +0000
+++ b/modules/alien/manifests/init.pp 2012-12-30 23:35:36 +0000
@@ -2,12 +2,12 @@
# need alien, dpkg and dependencies to create .deb repos
- $sles11alienrepo = "$operatingsystem-$operatingsystemrelease" ? {
+ $sles11alienrepo = "${operatingsystem}-${operatingsystemrelease}" ? {
/^SLES-11(\.[0-9])?$/ => File['/etc/zypp/repos.d/alien_for_sles11.repo'],
default => undef,
}
- $dpkgversion = "$operatingsystem-$operatingsystemrelease" ? {
+ $dpkgversion = "${operatingsystem}-${operatingsystemrelease}" ? {
/^SLES-11(\.[0-9])?$/ => '1.16.0.1-2lsb5',
default => present,
}
=== modified file 'modules/buildbot/manifests/master.pp'
--- a/modules/buildbot/manifests/master.pp 2012-12-20 18:16:34 +0000
+++ b/modules/buildbot/manifests/master.pp 2012-12-30 23:35:36 +0000
@@ -8,7 +8,7 @@
$weeklyrebuildarchs = 'x86,x86_64,ia64,ppc32,ppc64'
- $htpasswd = "$operatingsystem-$operatingsystemrelease" ? {
+ $htpasswd = "${operatingsystem}-${operatingsystemrelease}" ? {
/^SLES-11(\.[0-9])?$/ => 'htpasswd2',
default => 'htpasswd',
}
@@ -20,7 +20,7 @@
exec { "make-buildbot":
command => "/opt/buildbot/bin/pip install buildbot==$buildbotversion",
cwd => "/opt/buildbot",
- creates => "/opt/buildbot/lib/python$pythonversion/site-packages/buildbot-$buildbotversion-py$pythonversion.egg-info",
+ creates => "/opt/buildbot/lib/python${pythonversion}/site-packages/buildbot-${buildbotversion}-py${pythonversion}.egg-info",
path => [ "/opt/buildbot/bin", "/bin", "/sbin", "/usr/bin",
"/usr/sbin" ],
require => Exec["make-buildbot-virtualenv"],
=== modified file 'modules/buildbot/manifests/slave.pp'
--- a/modules/buildbot/manifests/slave.pp 2012-09-24 19:48:50 +0000
+++ b/modules/buildbot/manifests/slave.pp 2012-12-30 23:35:36 +0000
@@ -33,7 +33,7 @@
# Which SDKs should we use for released and beta builds?
- $releasedsdk = "$architecture-$::chroot" ? {
+ $releasedsdk = "${architecture}-${::chroot}" ? {
/^i386/ => 'lsb-sdk-4.1.4-1.ia32.tar.gz',
/^x86_64/ => 'lsb-sdk-4.1.4-1.x86_64.tar.gz',
/^ia64/ => 'lsb-sdk-4.1.4-1.ia64.tar.gz',
@@ -53,7 +53,7 @@
# XXX: this should migrate to using package repositories and
# the package resource in puppet.
- $lsbpythonurl = "$architecture-$::chroot" ? {
+ $lsbpythonurl = "${architecture}-${::chroot}" ? {
/^i386/ => 'http://ftp.linuxfoundation.org/pub/lsb/app-battery/released-4.1/ia32/lsb-python-2.4.6-5.lsb4.i486.rpm',
/^x86_64/ => 'http://ftp.linuxfoundation.org/pub/lsb/app-battery/released-4.1/amd64/lsb-python-2.4.6-5.lsb4.x86_64.rpm',
/^ia64/ => 'http://ftp.linuxfoundation.org/pub/lsb/app-battery/released-4.1/ia64/lsb-python-2.4.6-5.lsb4.ia64.rpm',
@@ -161,7 +161,7 @@
exec { "install-twisted":
command => "/opt/buildbot/bin/pip install Twisted==$twistedversion",
cwd => "/opt/buildbot",
- creates => "/opt/buildbot/lib/python$pythonversion/site-packages/twisted/__init__.py",
+ creates => "/opt/buildbot/lib/python${pythonversion}/site-packages/twisted/__init__.py",
path => [ "/opt/buildbot/bin", "/bin", "/sbin", "/usr/bin",
"/usr/sbin" ],
require => Exec["make-buildbot-virtualenv"],
@@ -170,7 +170,7 @@
exec { "install-buildslave":
command => "/opt/buildbot/bin/pip install buildbot-slave==$buildbotversion",
cwd => "/opt/buildbot",
- creates => "/opt/buildbot/lib/python$pythonversion/site-packages/buildbot_slave-$buildbotversion-py$pythonversion.egg-info",
+ creates => "/opt/buildbot/lib/python${pythonversion}/site-packages/buildbot_slave-${buildbotversion}-py${pythonversion}.egg-info",
path => [ "/opt/buildbot/bin", "/bin", "/sbin", "/usr/bin",
"/usr/sbin" ],
require => Exec["install-twisted"],
@@ -199,7 +199,7 @@
}
file { "/opt/buildbot/lsb-slave/info/host":
- content => "Host $fqdn, running $operatingsystem $operatingsystemrelease on $architecture.\n",
+ content => "Host ${fqdn}, running $operatingsystem $operatingsystemrelease on ${architecture}.\n",
require => Exec['make-slave'],
notify => Service['buildslave'],
}
@@ -220,7 +220,7 @@
}
exec { 'download-released-sdk':
- command => "wget http://ftp.linuxbase.org/pub/lsb/$releasedsdkpath/$releasedsdk",
+ command => "wget http://ftp.linuxbase.org/pub/lsb/${releasedsdkpath}/${releasedsdk}",
cwd => '/opt/buildbot',
path => [ '/bin', '/sbin', '/usr/bin', '/usr/sbin' ],
creates => "/opt/buildbot/$releasedsdk",
@@ -234,7 +234,7 @@
}
exec { 'download-beta-sdk':
- command => "wget http://ftp.linuxbase.org/pub/lsb/$betasdkpath/$betasdk",
+ command => "wget http://ftp.linuxbase.org/pub/lsb/${betasdkpath}/${betasdk}",
cwd => '/opt/buildbot',
path => [ '/bin', '/sbin', '/usr/bin', '/usr/sbin' ],
creates => "/opt/buildbot/$betasdk",
=== modified file 'modules/buildbot/manifests/slavepkgs.pp'
--- a/modules/buildbot/manifests/slavepkgs.pp 2012-10-04 21:11:17 +0000
+++ b/modules/buildbot/manifests/slavepkgs.pp 2012-12-30 23:35:36 +0000
@@ -46,7 +46,7 @@
default => 'lsb',
}
- $rpmpkg = "$operatingsystem-$operatingsystemrelease" ? {
+ $rpmpkg = "${operatingsystem}-${operatingsystemrelease}" ? {
/^SLES-.+$/ => 'rpm',
/^OpenSuSE-.+$/ => 'rpm',
default => 'rpm-build',
@@ -59,7 +59,7 @@
# Java package, needed by OLVER. On ia64, SuSE does not ship a
# decent JRE, so you have to download the ia64 JRE directly from
# Oracle.
- $javapkg = "$operatingsystem-$architecture" ? {
+ $javapkg = "${operatingsystem}-${architecture}" ? {
/^SLES-x86_64$/ => 'java-1_6_0-ibm',
/^SLES-s390x$/ => 'java-1_6_0-ibm',
/^SLES-ppc64$/ => 'java-1_6_0-ibm',
=== modified file 'modules/bzr/manifests/init.pp'
--- a/modules/bzr/manifests/init.pp 2012-02-12 20:49:14 +0000
+++ b/modules/bzr/manifests/init.pp 2012-12-30 23:35:36 +0000
@@ -3,12 +3,12 @@
# bzr on SLES 11 is too old; add a repository on the openSUSE
# Build Service for newer bzr.
- $sles11obsrepo = "$operatingsystem-$operatingsystemrelease" ? {
+ $sles11obsrepo = "${operatingsystem}-${operatingsystemrelease}" ? {
/^SLES-11(\.[0-9])?$/ => File['/etc/zypp/repos.d/devel_tools_scm.repo'],
default => undef,
}
- $bzrversion = "$operatingsystem-$operatingsystemrelease" ? {
+ $bzrversion = "${operatingsystem}-${operatingsystemrelease}" ? {
/^SLES-11(\.[0-9])?$/ => '2.4.1-18.1',
default => present,
}
=== modified file 'modules/php/manifests/init.pp'
--- a/modules/php/manifests/init.pp 2012-02-25 05:25:55 +0000
+++ b/modules/php/manifests/init.pp 2012-12-30 23:35:36 +0000
@@ -1,6 +1,6 @@
class php {
- $osdefault = "$operatingsystem-$operatingsystemrelease" ? {
+ $osdefault = "${operatingsystem}-${operatingsystemrelease}" ? {
/^SLES-11/ => 'default-sles11',
}
=== modified file 'modules/puppet/manifests/init.pp'
--- a/modules/puppet/manifests/init.pp 2012-12-30 23:04:59 +0000
+++ b/modules/puppet/manifests/init.pp 2012-12-30 23:35:36 +0000
@@ -1,16 +1,16 @@
class puppet {
- $osdefault = "$operatingsystem-$operatingsystem" ? {
+ $osdefault = "${operatingsystem}-${operatingsystemrelease}" ? {
/^SLES-11/ => 'default-sles11',
/^Debian/ => 'default-debian',
default => 'default-sles11',
}
- $puppetversion = "$operatingsystem-$operatingsystemrelease" ? {
+ $puppetversion = "${operatingsystem}-${operatingsystemrelease}" ? {
/^SLES-11\.1$/ => '2.7.6-9.1',
default => present,
}
- $facterversion = "$operatingsystem-$operatingsystemrelease" ? {
+ $facterversion = "${operatingsystem}-${operatingsystemrelease}" ? {
/^SLES-11\.1$/ => '1.5.2-1.20',
default => present,
}
=== modified file 'modules/python/manifests/virtualenv.pp'
--- a/modules/python/manifests/virtualenv.pp 2012-02-10 17:32:52 +0000
+++ b/modules/python/manifests/virtualenv.pp 2012-12-30 23:35:36 +0000
@@ -3,7 +3,7 @@
# These packages aren't available in certain SUSE variants, so we'll need
# to add the repos first.
- $osid = "$operatingsystem-$operatingsystemrelease"
+ $osid = "${operatingsystem}-${operatingsystemrelease}"
$suseobsrepo = "$osid" ? {
/^SLES-11(\.[0-9])?$/ => File['/etc/zypp/repos.d/devel_languages_python.repo'],
=== modified file 'modules/sudo/manifests/init.pp'
--- a/modules/sudo/manifests/init.pp 2012-03-02 13:03:38 +0000
+++ b/modules/sudo/manifests/init.pp 2012-12-30 23:35:36 +0000
@@ -2,7 +2,7 @@
include user::lfadmin
- $osdefault = "$operatingsystem-$operatingsystemrelease" ? {
+ $osdefault = "${operatingsystem}-${operatingsystemrelease}" ? {
/^(CentOS|RedHat)-5\.[0-9]+$/ => 'default-el5',
/^(CentOS|RedHat)-6(\.[0-9]+)?$/ => 'default-fedora',
/^Fedora-1[5-9]$/ => 'default-fedora',
More information about the lsb-messages
mailing list