From 2ab2111a2ede24e30b8fdeff4f4f23487acce5dd Mon Sep 17 00:00:00 2001 From: David Calavera Date: Tue, 12 Mar 2013 16:50:17 +0100 Subject: [PATCH] Stop hardcoding the server ssh port. --- lib/fog/compute/models/server.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/fog/compute/models/server.rb b/lib/fog/compute/models/server.rb index 4522d99a1..4bad62604 100644 --- a/lib/fog/compute/models/server.rb +++ b/lib/fog/compute/models/server.rb @@ -4,7 +4,7 @@ module Fog module Compute class Server < Fog::Model - attr_writer :username, :private_key, :private_key_path, :public_key, :public_key_path + attr_writer :username, :private_key, :private_key_path, :public_key, :public_key_path, :ssh_port def username @username ||= 'root' @@ -28,6 +28,9 @@ module Fog @public_key ||= public_key_path && File.read(public_key_path) end + def ssh_port + @ssh_port ||= 22 + end def scp(local_path, remote_path, upload_options = {}) require 'net/scp' @@ -58,10 +61,6 @@ module Fog Fog::SSH.new(public_ip_address, username, options).run(commands, &blk) end - def ssh_port - 22 - end - def sshable?(options={}) ready? && !public_ip_address.nil? && !!Timeout::timeout(8) { ssh('pwd', options) } rescue SystemCallError, Net::SSH::AuthenticationFailed, Timeout::Error