projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
port 6081 is redirected
[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
a0ab33c
..
afc7091
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':
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',
+ ensure => absent,
}
}
+ include debian_org::apt_restricted
package { 'hpacucli':
ensure => installed,
package { 'hpacucli':
ensure => installed,
@@
-28,11
+27,18
@@
class hardware::raid::proliant {
}
if $::smartarraycontroller_hpsa {
}
if $::smartarraycontroller_hpsa {
+ $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',
order => '020',
concat::fragment { 'dsa-puppet-stuff--nagios--dsa-check-hpssacli':
target => '/etc/cron.d/dsa-puppet-stuff',
order => '020',
- content => @(
EOF
)
- 27 */2 * * * root sleep $((
$RANDOM \% 900 )); dsa-wrap-nagios-check dsa-check-hpssacli
+ content => @(
"EOF"
)
+ 27 */2 * * * root sleep $((
RANDOM \% 900 )); dsa-wrap-nagios-check ${cmd}
| EOF
}
}
| EOF
}
}