kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

rebased with master

Browse source
This commit is contained in:
Kyle Rames 2013-02-05 10:32:40 -06:00
commit d059eb0aef
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/fog/core/scp.rb
View file

@ -52,6 +52,7 @@ module Fog
raise ArgumentError.new(':key_data, :keys, :password or a loaded ssh-agent is required to initialize SSH') raise ArgumentError.new(':key_data, :keys, :password or a loaded ssh-agent is required to initialize SSH')
end end
options[:timeout] = 30
if options[:key_data] || options[:keys] if options[:key_data] || options[:keys]
options[:keys_only] = true options[:keys_only] = true
#Explicitly set these so net-ssh doesn't add the default keys #Explicitly set these so net-ssh doesn't add the default keys

1
lib/fog/core/ssh.rb
View file

@ -46,6 +46,7 @@ module Fog
raise ArgumentError.new(':key_data, :keys, :password or a loaded ssh-agent is required to initialize SSH') raise ArgumentError.new(':key_data, :keys, :password or a loaded ssh-agent is required to initialize SSH')
end end
options[:timeout] = 30
if options[:key_data] || options[:keys] if options[:key_data] || options[:keys]
options[:keys_only] = true options[:keys_only] = true
#Explicitly set these so net-ssh doesn't add the default keys #Explicitly set these so net-ssh doesn't add the default keys

2
lib/fog/rackspace/models/compute_v2/servers.rb
View file

@ -31,7 +31,7 @@ module Fog
# #
def bootstrap(new_attributes = {}) def bootstrap(new_attributes = {})
server = create(new_attributes) server = create(new_attributes)
server.wait_for(1500) { ready? && !ipv4_address.empty? } server.wait_for(1500) { ready? && !public_ip_address.empty? }
server.setup(:password => server.password) server.setup(:password => server.password)
server server
end end