projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ports/static mirror: if listen_addr are not explicitly set, use the host's public...
[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
0360087
..
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 {
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,
package { 'hpacucli':
ensure => installed,
@@
-35,8
+34,8
@@
class hardware::raid::proliant {
default => 'dsa-check-hpssacli'
}
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}
order => '020',
content => @("EOF")
27 */2 * * * root sleep $(( RANDOM \% 900 )); dsa-wrap-nagios-check ${cmd}
@@
-45,7
+44,7
@@
class hardware::raid::proliant {
}
file { '/etc/cron.d/puppet-nagios-hpsa': ensure => absent, }
} else {
}
file { '/etc/cron.d/puppet-nagios-hpsa': ensure => absent, }
} else {
-
sit
e::aptrepo { 'debian.restricted':
+
bas
e::aptrepo { 'debian.restricted':
ensure => absent,
}
}
ensure => absent,
}
}