Merge pull request #166 from mansam/dont-pass-nil-ssl-options-to-try_…

…connection Don't pass nil ssl_options to try_connection
ManageIQ · Nov 28, 2017 · da96f85 · da96f85
2 parents 0b18683 + d7b4a90
commit da96f85
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/manageiq/providers/openstack/legacy/openstack_handle/handle.rb b/lib/manageiq/providers/openstack/legacy/openstack_handle/handle.rb
@@ -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)