From 89b4b0f3f20d76539eecc95a69fa940f4dae7fbb Mon Sep 17 00:00:00 2001 From: roedie Date: Thu, 25 Feb 2016 09:09:56 +0100 Subject: Update doc: proxy to ssh_proxy --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5158ed5..370d07b 100644 --- a/README.md +++ b/README.md @@ -304,7 +304,7 @@ source: ### SSH Proxy Command -Oxidized can `ssh` through a proxy as well. To do so we just need to set `proxy` variable. +Oxidized can `ssh` through a proxy as well. To do so we just need to set `ssh_proxy` variable. ``` ... @@ -313,7 +313,7 @@ map: model: 1 vars_map: enable: 2 - proxy: 3 + ssh_proxy: 3 ... ``` -- cgit v1.2.1 From 1a68e83169f1fc16d8a222cb18f3f390c9c5d51d Mon Sep 17 00:00:00 2001 From: roedie Date: Thu, 25 Feb 2016 09:14:20 +0100 Subject: Update spec: Change proxy to ssh_proxy --- spec/input/ssh_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/input/ssh_spec.rb b/spec/input/ssh_spec.rb index 43c7d66..0b6cf72 100644 --- a/spec/input/ssh_spec.rb +++ b/spec/input/ssh_spec.rb @@ -12,7 +12,7 @@ describe Oxidized::SSH do model: 'junos', username: 'alma', password: 'armud', - vars: {proxy: 'test.com'}) + vars: {ssh_proxy: 'test.com'}) end @@ -25,10 +25,10 @@ describe Oxidized::SSH do @node.expects(:model).returns(model) proxy = mock() - Net::SSH::Proxy::Command.expects(:new).with("ssh test.com nc %h %p").returns(proxy) + Net::SSH::Proxy::Command.expects(:new).with("ssh test.com -W %h:%p").returns(proxy) Net::SSH.expects(:start).with('93.184.216.34', 'alma', {:port => 22, :password => 'armud', :timeout => Oxidized.config.timeout, :paranoid => Oxidized.config.input.ssh.secure, :auth_methods => ['none', 'publickey', 'password', 'keyboard-interactive'], - :number_of_password_prompts => 0, :proxy => proxy}) + :number_of_password_prompts => 0, :ssh_roxy => proxy}) ssh.instance_variable_set("@exec", true) ssh.connect(@node) -- cgit v1.2.1