diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-29 22:13:00 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-29 22:13:00 -0200 |
| commit | da1a58d5ee1623a7cc17045b9e2953c1c9f449ef (patch) | |
| tree | 9516074fbe69efc5cf3a7e697893a5bda2bf11b3 /manifests | |
| parent | 794e890b4d991be1b7cdf030b90f6bc34764b6b8 (diff) | |
| download | puppet-nodo-da1a58d5ee1623a7cc17045b9e2953c1c9f449ef.tar.gz puppet-nodo-da1a58d5ee1623a7cc17045b9e2953c1c9f449ef.tar.bz2 | |
More variable scope updates
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/subsystems/utils/laptop.pp | 6 | ||||
| -rw-r--r-- | manifests/subsystems/utils/multimedia.pp | 4 | ||||
| -rw-r--r-- | manifests/subsystems/utils/security.pp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/manifests/subsystems/utils/laptop.pp b/manifests/subsystems/utils/laptop.pp index 3519415..614e278 100644 --- 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 bea62ec..2b09808 100644 --- 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 79c8ef0..9e4f362 100644 --- 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, } |