X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fhardware%2Fmanifests%2Fraid%2Fproliant.pp;h=78c5422a73342c5bc54d77fe442641585600dc21;hb=168aa3f05f914802698b8db5fdde823c4e992913;hp=afc7091386c9772edf44106f046bce79991ce173;hpb=2556124d53a7f3cf725a53b9dab821036e144b6b;p=mirror%2Fdsa-puppet.git diff --git a/modules/hardware/manifests/raid/proliant.pp b/modules/hardware/manifests/raid/proliant.pp index afc709138..78c5422a7 100644 --- a/modules/hardware/manifests/raid/proliant.pp +++ b/modules/hardware/manifests/raid/proliant.pp @@ -1,6 +1,6 @@ class hardware::raid::proliant { if $::smartarraycontroller_hpsa or $::smartarraycontroller_cciss { - site::aptrepo { 'debian.restricted': + base::aptrepo { 'debian.restricted': ensure => absent, } include debian_org::apt_restricted @@ -34,8 +34,8 @@ class hardware::raid::proliant { 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, } }