Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
Choose a Base Repository
puppetlabs/mcollective-puppet-agent
LabattFoodService/mcollective-puppet-agent
LorcanHamill/mcollective-puppet-agent
MikaelSmith/mcollective-puppet-agent
Mischrantier/mcollective-puppet-agent
MosesMendoza/mcollective-puppet-agent
UcasRichard/mcollective-puppet-agent
abhaychrungoo/mcollective-puppet-agent
alexjfisher/mcollective-puppet-agent
andersonmills/mcollective-puppet-agent
beergeek/mcollective-puppet-agent
bennysan/mcollective-puppet-agent
bluemutedwisdom/mcollective-puppet-agent
byronsanchez/mcollective-puppet-agent
clantant/mcollective-puppet-agent
clemensw/mcollective-puppet-agent
gtmtechltd/mcollective-puppet-agent
jantman/mcollective-puppet-agent
jhg03a/mcollective-puppet-agent
jinjin123/mcollective-puppet-agent
jlambert121/mcollective-puppet-agent
joshcooper/mcollective-puppet-agent
liavkoren/mcollective-puppet-agent
llowder/mcollective-puppet-agent
m4ce/mcollective-puppet-agent
masterzen/mcollective-puppet-agent
melissa/mcollective-puppet-agent
mruzicka/mcollective-puppet-agent
mrzarquon/mcollective-puppet-agent
msutter/mcollective-puppet-agent
nicklewis/mcollective-puppet-agent
nmunagala/mcollective-puppet-agent
olivierHa/mcollective-puppet-agent
optionalg/mcollective-puppet-agent
parisiale/mcollective-puppet-agent
pdcleyn/mcollective-puppet-agent
ploubser/mcollective-puppet-agent
raphink/mcollective-puppet-agent
reidmv/mcollective-puppet-agent
richardc/mcollective-puppet-agent
saikatbanerji/mcollective-puppet-agent
shance3c/mcollective-puppet-agent
slseed1969/mcollective-puppet-agent
spandeyindia/mcollective-puppet-agent
srinivas-adivi/mcollective-puppet-agent
tczekajlo/mcollective-puppet-agent
trevor-vaughan/mcollective-puppet-agent
underscorgan/mcollective-puppet-agent
ygindin1/mcollective-puppet-agent
yo61/mcollective-puppet-agent
Nothing to show
Choose a base branch
Nothing to show
Choose a Head Repository
puppetlabs/mcollective-puppet-agent
LabattFoodService/mcollective-puppet-agent
LorcanHamill/mcollective-puppet-agent
MikaelSmith/mcollective-puppet-agent
Mischrantier/mcollective-puppet-agent
MosesMendoza/mcollective-puppet-agent
UcasRichard/mcollective-puppet-agent
abhaychrungoo/mcollective-puppet-agent
alexjfisher/mcollective-puppet-agent
andersonmills/mcollective-puppet-agent
beergeek/mcollective-puppet-agent
bennysan/mcollective-puppet-agent
bluemutedwisdom/mcollective-puppet-agent
byronsanchez/mcollective-puppet-agent
clantant/mcollective-puppet-agent
clemensw/mcollective-puppet-agent
gtmtechltd/mcollective-puppet-agent
jantman/mcollective-puppet-agent
jhg03a/mcollective-puppet-agent
jinjin123/mcollective-puppet-agent
jlambert121/mcollective-puppet-agent
joshcooper/mcollective-puppet-agent
liavkoren/mcollective-puppet-agent
llowder/mcollective-puppet-agent
m4ce/mcollective-puppet-agent
masterzen/mcollective-puppet-agent
melissa/mcollective-puppet-agent
mruzicka/mcollective-puppet-agent
mrzarquon/mcollective-puppet-agent
msutter/mcollective-puppet-agent
nicklewis/mcollective-puppet-agent
nmunagala/mcollective-puppet-agent
olivierHa/mcollective-puppet-agent
optionalg/mcollective-puppet-agent
parisiale/mcollective-puppet-agent
pdcleyn/mcollective-puppet-agent
ploubser/mcollective-puppet-agent
raphink/mcollective-puppet-agent
reidmv/mcollective-puppet-agent
richardc/mcollective-puppet-agent
saikatbanerji/mcollective-puppet-agent
shance3c/mcollective-puppet-agent
slseed1969/mcollective-puppet-agent
spandeyindia/mcollective-puppet-agent
srinivas-adivi/mcollective-puppet-agent
tczekajlo/mcollective-puppet-agent
trevor-vaughan/mcollective-puppet-agent
underscorgan/mcollective-puppet-agent
ygindin1/mcollective-puppet-agent
yo61/mcollective-puppet-agent
Nothing to show
Choose a head branch
Nothing to show
  • 2 commits
  • 1 file changed
  • 0 commit comments
  • 2 contributors
Commits on Jul 06, 2015
Enable splay/force options when using puppet in daemon mode, without …
…signal_daemon set

When using puppet in daemon mode, you can't give additional arguments
using signal_daemon to trigger a run.  Here we allow mcollective
to pass a splay argument when puppet is running in daemon mode.
Merge pull request #59 from richardc/pr_55_cleanup
Enable splay/force options when using puppet in daemon mode, without signal_daemon set
Showing with 3 additions and 2 deletions.
  1. +3 −2 agent/puppet.rb
View
@@ -205,8 +205,9 @@ def run(command, options)
args[:ignoreschedules] = request[:ignoreschedules] if request[:ignoreschedules]
args[:signal_daemon] = false if MCollective::Util.windows?
# we can only pass splay arguments if the daemon isn't running :(
unless @puppet_agent.status[:daemon_present]
# we can only pass splay arguments if the daemon isn't in signal mode :(
signal_daemon = Util.str_to_bool(@config.pluginconf.fetch("puppet.signal_daemon","true"))
unless @puppet_agent.status[:daemon_present] && signal_daemon
if request[:force] == true
# forcing implies --no-splay
args[:splay] = false

No commit comments for this range