openstack
/
fuel-astute
Code Issues Proposed changes

Merge "Add local puppet log file on the nodes"

This commit is contained in:
Jenkins 2014-05-13 07:46:03 +00:00 committed by Gerrit Code Review
parent 2d2a44d2f7 fbecf57fe8
commit 1b97b4d883
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mcagents/puppetd.rb
View File

@ -36,6 +36,7 @@ module MCollective
def startup_hook
@splaytime = @config.pluginconf["puppetd.splaytime"].to_i || 0
@lockfile = @config.pluginconf["puppetd.lockfile"] || "/tmp/puppetd.lock"
@log = @config.pluginconf["puppetd.log"] || "/var/log/puppet.log"
@statefile = @config.pluginconf["puppetd.statefile"] || "/var/lib/puppet/state/state.yaml"
@pidfile = @config.pluginconf["puppet.pidfile"] || "/var/run/puppet/agent.pid"
@puppetd = @config.pluginconf["puppetd.puppetd"] || "/usr/sbin/daemonize -a \
@ -181,6 +182,7 @@ module MCollective
cmd << '--debug' if request[:puppet_debug]
cmd << '--evaltrace' if request[:puppet_debug]
cmd << "--logdest #{@log}" if @log
cmd = cmd.join(" ")