Merge pull request #14172 from tzumainn/openstack-excon-options

Add openstack excon settings
ManageIQ · Mar 15, 2017 · 0c6b077 · 0c6b077
2 parents 8f29231 + 15510eb
commit 0c6b077
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/app/models/manageiq/providers/openstack/manager_mixin.rb b/app/models/manageiq/providers/openstack/manager_mixin.rb
@@ -43,8 +43,10 @@ def openstack_handle(options = {})
         :ssl_ca_path    => ::Settings.ssl.ssl_ca_path,
         :ssl_cert_store => OpenSSL::X509::Store.new
       }
-      extra_options[:domain_id] = keystone_v3_domain_id
-      extra_options[:region]    = provider_region if provider_region.present?
+      extra_options[:domain_id]         = keystone_v3_domain_id
+      extra_options[:region]            = provider_region if provider_region.present?
+      extra_options[:omit_default_port] = ::Settings.ems.ems_openstack.excon.omit_default_port
+      extra_options[:read_timeout]      = ::Settings.ems.ems_openstack.excon.read_timeout
 
       osh = OpenstackHandle::Handle.new(username, password, address, port, api_version, security_protocol, extra_options)
       osh.connection_options = {:instrumentor => $fog_log}

diff --git a/config/settings.yml b/config/settings.yml
@@ -96,6 +96,10 @@
     :keep_drift_states: 6.months
     :purge_window_size: 10000
 :ems:
+  :ems_openstack:
+    :excon:
+      :omit_default_port: true
+      :read_timeout: 60
   :ems_redhat:
     :resolve_ip_addresses: true
     :inventory: