Using explicit variable scoping

diff --git a/manifests/nodo.pp b/manifests/nodo.pp
index f57e86d9313d7395585070ebf237c5dfb23781f3..36b04a58c45c824a0a97c9abe7cc85dd74033a2b 100644 (file)
--- 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,
       }