try this

[mirror/dsa-puppet.git] / modules / hardware / manifests / raid / proliant.pp

diff --git a/modules/hardware/manifests/raid/proliant.pp b/modules/hardware/manifests/raid/proliant.pp
index 410bb5e..a546aee 100644 (file)
--- a/modules/hardware/manifests/raid/proliant.pp
+++ b/modules/hardware/manifests/raid/proliant.pp
@@ -2,7 +2,7 @@ class hardware::raid::proliant {
 
        site::aptrepo { 'debian.restricted':
                url        => 'http://db.debian.org/debian-admin',
-               suite      => 'lenny-restricted',
+               suite      => "${::lsbdistcodename}-restricted",
                components => 'non-free',
        }
 
@@ -10,12 +10,11 @@ class hardware::raid::proliant {
                ensure  => installed,
                tag    => extra_repo,
        }
-       package { 'hp-health':
-               ensure => installed,
-               tag    => extra_repo,
-       }
-       package { 'arrayprobe':
-               ensure => installed,
+       if !("$::systemproductname" in ["ProLiant DL180 G5", "ProLiant DL120 G5"]) {
+               package { 'hp-health':
+                       ensure => installed,
+                       tag    => extra_repo,
+               }
        }
 
        if $::debarchitecture == 'amd64' {