More variable scope updates

diff --git a/manifests/subsystems/utils/laptop.pp b/manifests/subsystems/utils/laptop.pp
index 3519415bdaa9bc3bf448e8f4188733323db91eef..614e278c35a2011c688af6ef40f422e10dd76ee7 100644 (file)
--- a/manifests/subsystems/utils/laptop.pp
+++ b/manifests/subsystems/utils/laptop.pp
@@ -1,6 +1,6 @@
 # Common utilities for laptop
 class utils::laptop {
-  case $operatingsystem {
+  case $::operatingsystem {
     debian: { 
       include utils::laptop::debian
     }
@@ -24,14 +24,14 @@ class utils::laptop::debian {
 
   # Lenny specific packages
   package { [ 'madwifi-source', 'madwifi-tools', 'bluez-gnome' ]:
-    ensure => $lsbdistcodename ? {
+    ensure => $::lsbdistcodename ? {
       'lenny' => installed,
       default => absent,
     }
   }
 
   # Hibernation on lenny
-  if $lsbdistcodename == 'lenny' {
+  if $::lsbdistcodename == 'lenny' {
     $hibernate = hiera('nodo::laptop::hibernate', false)
     package { 'uswsusp':
       ensure => $hibernate ? {

diff --git a/manifests/subsystems/utils/multimedia.pp b/manifests/subsystems/utils/multimedia.pp
index bea62ec8679022528ca1a1a05dc03559967bfde7..2b0980843810a2ad1f0a8dfd58881dee8de3f619 100644 (file)
--- a/manifests/subsystems/utils/multimedia.pp
+++ b/manifests/subsystems/utils/multimedia.pp
@@ -1,7 +1,7 @@
 # Multimedia utilities
 class utils::multimedia::studio {
   package { [ 'ardour', 'hydrogen', ]:
-    ensure => $lsbdistcodename ? {
+    ensure => $::lsbdistcodename ? {
       'lenny' => absent,
       default => installed,
     }
@@ -29,7 +29,7 @@ class utils::multimedia {
   }
 
   package { 'landell':
-    ensure => $lsbdistcodename ? {
+    ensure => $::lsbdistcodename ? {
       'squeeze' => absent,
       default   => installed,
     }

diff --git a/manifests/subsystems/utils/security.pp b/manifests/subsystems/utils/security.pp
index 79c8ef008c373c5828f9cb7f2999ee0ac725e1be..9e4f362d211389392c5762dc582f4ba5c2bd51cd 100644 (file)
--- a/manifests/subsystems/utils/security.pp
+++ b/manifests/subsystems/utils/security.pp
@@ -5,7 +5,7 @@ class utils::security {
     ensure => installed,
   }
 
-  if $lsbdistcodename != 'squeeze' {
+  if $::lsbdistcodename != 'squeeze' {
     package { [ 'kedpm', 'kedpm-gtk' ]:
       ensure => installed,
     }