diff options
| author | Neil Lathwood <neil@lathwood.co.uk> | 2018-02-05 21:55:31 +0000 |
|---|---|---|
| committer | Neil Lathwood <neil@lathwood.co.uk> | 2018-02-05 21:55:31 +0000 |
| commit | 7c108b6b7a3277aac44455b93a587d1d01a58041 (patch) | |
| tree | 1614ebd1e77e860a1f942a38f86b4a77feb7875d /lib | |
| parent | 2726fff67ded963e24776e60f1e8976ae2bb037b (diff) | |
Added support for setting ssh auth methods
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/oxidized/input/ssh.rb | 5 | ||||
| -rw-r--r-- | lib/oxidized/worker.rb | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/oxidized/input/ssh.rb b/lib/oxidized/input/ssh.rb index 27e81e0..8df18f5 100644 --- a/lib/oxidized/input/ssh.rb +++ b/lib/oxidized/input/ssh.rb @@ -29,10 +29,13 @@ module Oxidized :port => port.to_i, :password => @node.auth[:password], :timeout => Oxidized.config.timeout, :paranoid => secure, - :auth_methods => %w(none publickey password keyboard-interactive), :number_of_password_prompts => 0, } + auth_methods = vars(:auth_methods) || %w(none publickey password) + ssh_opts[:auth_methods] = auth_methods + Oxidized.logger.info "AUTH METHODS::#{auth_methods}" + if proxy_host = vars(:ssh_proxy) proxy_command = "ssh " proxy_command += "-o StrictHostKeyChecking=no " unless secure diff --git a/lib/oxidized/worker.rb b/lib/oxidized/worker.rb index 4173680..062233b 100644 --- a/lib/oxidized/worker.rb +++ b/lib/oxidized/worker.rb @@ -80,7 +80,11 @@ module Oxidized private def is_cycle_finished? - @jobs_done > 0 && @jobs_done % @nodes.count == 0 + if @jobs_done > @nodes.count + true + else + @jobs_done > 0 && @jobs_done % @nodes.count == 0 + end end def run_done_hook |