openstack
/
fuel-astute
Code Issues Proposed changes

Run puppet in debug mode if 'debug' fact is set 

Also add a --trace permanent option for puppet run.

BP https://blueprints.launchpad.net/fuel/+spec/fuel-enable-debug-in-cli

Change-Id: Ia8ab8878d755559377e4e87f38c5033dfa4715b4
This commit is contained in:
Andrey Danin 2013-11-20 14:46:27 +04:00
parent ef91b3a510
commit 596a9ffbfd
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/astute/puppetd.rb
View File

@ -36,16 +36,18 @@ module Astute
# Runs puppetd.runonce only if puppet is stopped on the host at the time
# If it isn't stopped, we wait a bit and try again.
# Returns list of nodes uids which appear to be with hung puppet.
def self.puppetd_runonce(puppetd, uids)
def self.puppetd_runonce(puppetd, uids, nodes)
debug_mode_dict = nodes.inject({}) {|dict, node| dict[node['uid']] = node['debug']; dict}
started = Time.now.to_i
while Time.now.to_i - started < Astute.config.PUPPET_FADE_TIMEOUT
puppetd.discover(:nodes => uids)
last_run = puppetd.last_run_summary
running_uids = last_run.select {|x| x.results[:data][:status] != 'stopped'}.map {|n| n.results[:sender]}
stopped_uids = uids - running_uids
if stopped_uids.any?
puppetd.discover(:nodes => stopped_uids)
puppetd.runonce
# If stopped_uids is empty this cycle will not be called.
stopped_uids.each do |uid|
puppetd.discover(:nodes => [uid])
puppetd.runonce(:puppet_debug => debug_mode_dict[uid])
end
uids = running_uids
break if uids.empty?
@ -109,7 +111,7 @@ module Astute
ctx.report_and_update_status('nodes' => nodes)
end if change_node_status
prev_summary = puppetd.last_run_summary
puppetd_runonce(puppetd, uids)
puppetd_runonce(puppetd, uids, nodes)
nodes_to_check = uids
last_run = puppetd.last_run_summary
while nodes_to_check.any?
@ -139,7 +141,7 @@ module Astute
end
if nodes_to_retry.any?
Astute.logger.info "Retrying to run puppet for following error nodes: #{nodes_to_retry.join(',')}"
puppetd_runonce(puppetd, nodes_to_retry)
puppetd_runonce(puppetd, nodes_to_retry, nodes)
# We need this magic with prev_summary to reflect new puppetd run statuses..
prev_summary.delete_if { |x| nodes_to_retry.include?(x.results[:sender]) }
prev_summary += last_run.select { |x| nodes_to_retry.include?(x.results[:sender]) }

4
mcagents/puppetd.rb
View File

@ -157,7 +157,7 @@ module MCollective
end
def runonce_background
cmd = [@puppetd, "--onetime", "--ignorecache", "--logdest", 'syslog']
cmd = [@puppetd, "--onetime", "--ignorecache", "--logdest", 'syslog', '--trace']
unless request[:forcerun]
if @splaytime && @splaytime > 0
@ -165,6 +165,8 @@ module MCollective
end
end
cmd << '--debug' if request[:puppet_debug]
cmd = cmd.join(" ")
output = reply[:output] || ''