tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clarified: Recorder dependency fixes

Browse source
This commit is contained in:
Ossi Salmi 2013-11-18 00:37:45 +02:00
parent 83ee5a04ac
commit bf1e65ef93
1 changed files with 32 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
clarified/manifests/init.pp
View file

@ -91,18 +91,16 @@ class clarified::recorder {
owner => "root",
group => "root",
source => "puppet:///files/packages/${clarified_recorder_package}",
before => Exec["/usr/local/src/clarified-recorder-linux.sh"],
notify => Exec["rm -f /usr/local/probe"],
}
exec { "rm -f /usr/local/probe":
path => "/bin:/usr/bin:/sbin:/usr/sbin",
onlyif => "test -h /usr/local/probe",
subscribe => File["/usr/local/src/clarified-recorder-linux.sh"],
before => Exec["/usr/local/src/clarified-recorder-linux.sh"],
refreshonly => true,
}
exec { "/usr/local/src/clarified-recorder-linux.sh":
creates => "/usr/local/probe",
notify => Service["clarified-probe"],
}
exec { "clarified-functions":
@ -133,6 +131,7 @@ class clarified::recorder {
refreshonly => true,
before => Service["clarified-probe"],
}
service { "clarified-probe":
enable => true,
}
@ -174,10 +173,21 @@ class clarified::recorder {
# collab => [ "collabname:PageName" ],
# }
#
define clarified::probe($interface="", $snaplen="65535", $keeptime="100GB",
$blocksize="1GB", $filter="", $remoteport="10000",
$collab=[], $probeopt="", $remoteopt="",
$probe=true, $remote=true) {
define clarified::probe(
$interface=undef,
$snaplen="65535",
$keeptime="100GB",
$blocksize="1GB",
$filter="",
$remoteport="10000",
$collab=[],
$probeopt="",
$remoteopt="",
$probe=true,
$remote=true
) {
Class["clarified::recorder"] -> Clarified::Probe[$name]
if $interface {
$interface_real = $interface
@ -218,6 +228,7 @@ define clarified::probe($interface="", $snaplen="65535", $keeptime="100GB",
restart => "/etc/clarified/probe.d/${name} restart",
stop => "pkill -f /var/run/probe/${name}.pid",
status => "pgrep -f /var/run/probe/${name}.pid",
subscribe => Exec["/usr/local/src/clarified-recorder-linux.sh"],
}
file { "/etc/clarified/remote.d/${name}":
@ -246,6 +257,8 @@ define clarified::probe($interface="", $snaplen="65535", $keeptime="100GB",
restart => "/etc/clarified/remote.d/${name} restart",
stop => "pkill -f /var/run/remote/${name}.pid",
status => "pgrep -f /var/run/remote/${name}.pid",
require => Service["probe-${name}"],
subscribe => Exec["/usr/local/src/clarified-recorder-linux.sh"],
}
}