make site::aptrepo a proper type

[dsa-puppet.git] / modules / debian-org / manifests / proliant.pp

diff --git a/modules/debian-org/manifests/proliant.pp b/modules/debian-org/manifests/proliant.pp
index afb6bed529db187ab227c0c75887e0c4eb8fa8d1..28a177b4a7ebb4df64f0f9e343609d43f903357d 100644 (file)
--- a/modules/debian-org/manifests/proliant.pp
+++ b/modules/debian-org/manifests/proliant.pp
@@ -1,25 +1,29 @@
 class debian-org::proliant {
 
        site::aptrepo { 'debian.restricted':
-               content => template('debian-org/etc/apt/sources.list.d/debian.restricted.list.erb'),
+               url        => 'http://db.debian.org/debian-admin',
+               suite      => 'lenny-restricted',
+               components => 'non-free',
        }
 
        package { 'hpacucli':
-               ensure => installed,
+               ensure  => installed,
+               require => [
+                       File['/etc/apt/sources.list.d/debian.restricted.list'],
+                       Exec['apt-get update']
+               ]
        }
        package { 'hp-health':
                ensure => installed,
+               require => [
+                       File['/etc/apt/sources.list.d/debian.restricted.list'],
+                       Exec['apt-get update']
+               ]
        }
        package { 'arrayprobe':
                ensure => installed,
        }
 
-       if $::lsbdistcodename == 'lenny' {
-               package { 'cpqarrayd':
-                       ensure => installed,
-               }
-       }
-
        if $::debarchitecture == 'amd64' {
                package { 'lib32gcc1':
                        ensure => installed,