mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
Upgrade to excon version 0.13.0 to take advantage of the ssl_verify_peer and ssl_ca_file params via the connection_options hash. Also, remove the use of :hp_servicenet setting for ssl for storage and compute providers.
This commit is contained in:
parent
ad9433fe00
commit
9b502c9827
3 changed files with 5 additions and 7 deletions
|
@ -42,12 +42,12 @@ Gem::Specification.new do |s|
|
|||
## List your runtime dependencies here. Runtime dependencies are those
|
||||
## that are needed for an end user to actually USE your code.
|
||||
s.add_dependency('builder')
|
||||
s.add_dependency('excon', '~>0.7.3')
|
||||
s.add_dependency('excon', '~>0.13.0')
|
||||
s.add_dependency('formatador', '~>0.2.0')
|
||||
s.add_dependency('multi_json', '~>1.0.3')
|
||||
s.add_dependency('multi_json', '~>1.0')
|
||||
s.add_dependency('mime-types')
|
||||
s.add_dependency('net-scp', '~>1.0.4')
|
||||
s.add_dependency('net-ssh', '~>2.1.4')
|
||||
s.add_dependency('net-ssh', '>=2.1.3')
|
||||
s.add_dependency('nokogiri', '~>1.5.0')
|
||||
s.add_dependency('ruby-hmac')
|
||||
|
||||
|
|
|
@ -133,12 +133,11 @@ module Fog
|
|||
@auth_token = credentials[:auth_token]
|
||||
|
||||
uri = URI.parse(@hp_compute_uri)
|
||||
@host = @hp_servicenet == true ? "snet-#{uri.host}" : uri.host
|
||||
@host = uri.host
|
||||
@path = uri.path
|
||||
@persistent = options[:persistent] || false
|
||||
@port = uri.port
|
||||
@scheme = uri.scheme
|
||||
Excon.ssl_verify_peer = false if options[:hp_servicenet] == true
|
||||
|
||||
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
|
||||
end
|
||||
|
|
|
@ -158,12 +158,11 @@ module Fog
|
|||
@auth_token = credentials[:auth_token]
|
||||
|
||||
uri = URI.parse(@hp_storage_uri)
|
||||
@host = options[:hp_servicenet] == true ? "snet-#{uri.host}" : uri.host
|
||||
@host = uri.host
|
||||
@path = uri.path
|
||||
@persistent = options[:persistent] || false
|
||||
@port = uri.port
|
||||
@scheme = uri.scheme
|
||||
Excon.ssl_verify_peer = false if options[:hp_servicenet] == true
|
||||
|
||||
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue