lint fixes for the linux module

[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 cd8afaa..78c5422 100644 (file)
--- a/modules/hardware/manifests/raid/proliant.pp
+++ b/modules/hardware/manifests/raid/proliant.pp
@@ -1,10 +1,9 @@
 class hardware::raid::proliant {
        if $::smartarraycontroller_hpsa or $::smartarraycontroller_cciss {
-               site::aptrepo { 'debian.restricted':
-                       url        => 'http://db.debian.org/debian-admin',
-                       suite      => "${::lsbdistcodename}-restricted",
-                       components => 'non-free',
+               base::aptrepo { 'debian.restricted':
+                       ensure => absent,
                }
+               include debian_org::apt_restricted
 
                package { 'hpacucli':
                        ensure  => installed,
@@ -31,11 +30,12 @@ class hardware::raid::proliant {
                        $cmd = $hostname ? {
                                'lobos' => 'dsa-check-hpssacli --no-battery',
                                'villa' => 'dsa-check-hpssacli --no-battery',
+                               'lw08'  => 'dsa-check-hpssacli --no-battery --ignore-cache',
                                default => 'dsa-check-hpssacli'
                        }
 
-                       concat::fragment { 'dsa-puppet-stuff--nagios--dsa-check-hpssacli':
-                               target => '/etc/cron.d/dsa-puppet-stuff',
+                       concat::fragment { 'puppet-crontab--nagios--dsa-check-hpssacli':
+                               target => '/etc/cron.d/puppet-crontab',
                                order  => '020',
                                content  => @("EOF")
                                        27 */2 * * * root sleep $(( RANDOM \% 900 )); dsa-wrap-nagios-check ${cmd}
@@ -44,7 +44,7 @@ class hardware::raid::proliant {
                }
                file { '/etc/cron.d/puppet-nagios-hpsa': ensure => absent, }
        } else {
-               site::aptrepo { 'debian.restricted':
+               base::aptrepo { 'debian.restricted':
                        ensure => absent,
                }
        }