Skip to content

Commit

Permalink
Merge pull request #166 from mansam/dont-pass-nil-ssl-options-to-try_…
Browse files Browse the repository at this point in the history
…connection

Don't pass nil ssl_options to try_connection
(cherry picked from commit da96f85)

https://bugzilla.redhat.com/show_bug.cgi?id=1518338
  • Loading branch information
aufi authored and simaishi committed Nov 28, 2017
1 parent 26dc282 commit 43a69c5
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def self.try_connection(security_protocol, ssl_options = {})

def self.raw_connect_try_ssl(username, password, address, port, service = "Compute", opts = nil, api_version = nil,
security_protocol = nil)
ssl_options = opts.delete(:ssl_options)
ssl_options = opts.delete(:ssl_options) || {}
try_connection(security_protocol, ssl_options) do |scheme, connection_options|
auth_url = auth_url(address, port, scheme, api_version)
opts[:connection_options] = (opts[:connection_options] || {}).merge(connection_options)
Expand Down

0 comments on commit 43a69c5

Please sign in to comment.