Permalink
Comparing changes
Open a pull request
- 2 commits
- 1 file changed
- 0 commit comments
- 2 contributors
Unified
Split
Showing
with
3 additions
and 2 deletions.
- +3 −2 agent/puppet.rb
| @@ -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 | ||