diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-25 17:30:47 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-25 17:30:47 -0200 |
| commit | e0d644221e677dbdf3f4c8630d5e49e02775741f (patch) | |
| tree | b4c02565573efb98fefd08fd75eda3121f0c0755 | |
| parent | 366f61dafb986a9ee6577557d09d6c9fccd34084 (diff) | |
| download | puppet-nodo-e0d644221e677dbdf3f4c8630d5e49e02775741f.tar.gz puppet-nodo-e0d644221e677dbdf3f4c8630d5e49e02775741f.tar.bz2 | |
Using explicit variable scoping
| -rw-r--r-- | manifests/nodo.pp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/manifests/nodo.pp b/manifests/nodo.pp index f57e86d..36b04a5 100644 --- a/manifests/nodo.pp +++ b/manifests/nodo.pp @@ -68,8 +68,8 @@ class nodo { $apt_domain_source = hiera('nodo::apt_domain_source', false) - apt::sources_list { "$domain.list": - source => "puppet:///modules/site_apt/sources.list.d/$operatingsystem/$domain.list", + apt::sources_list { "${::domain}.list": + source => "puppet:///modules/site_apt/sources.list.d/${::operatingsystem}/${::domain}.list", ensure => $apt_domain_source ? { true => present, default => absent, @@ -77,12 +77,12 @@ class nodo { } # Preferences file can't have dots in the filename - $apt_domain_preferences = regsubst($domain, '\.', '-', 'G') + $apt_domain_preferences = regsubst($::domain, '\.', '-', 'G') - file { "/etc/apt/preferences.d/$apt_domain_preferences": - source => [ "puppet:///modules/site_apt/preferences.d/$operatingsystem/$domain", + file { "/etc/apt/preferences.d/${apt_domain_preferences}": + source => [ "puppet:///modules/site_apt/preferences.d/${::operatingsystem}/${::domain}", "puppet:///modules/nodo/preferences.d/custom" ], - ensure => $apt_domain_source ? { + ensure => ${apt_domain_source} ? { true => present, default => absent, } |