openshift_connect reuse kubernetes_connect

Minor change: now respects options[:path], previously was forcing '/oapi'.
cben · Apr 30, 2017 · 5d35988 · 5d35988
1 parent 1a25fff
commit 5d35988
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/app/models/manageiq/providers/openshift/container_manager_mixin.rb b/app/models/manageiq/providers/openshift/container_manager_mixin.rb
@@ -32,15 +32,8 @@ def raw_connect(hostname, port, options)
     end
 
     def openshift_connect(hostname, port, options)
-      require 'kubeclient'
-
-      Kubeclient::Client.new(
-        raw_api_endpoint(hostname, port, '/oapi'),
-        options[:version] || api_version,
-        :ssl_options    => Kubeclient::Client::DEFAULT_SSL_OPTIONS.merge(options[:ssl_options] || {}),
-        :auth_options   => kubernetes_auth_options(options),
-        :http_proxy_uri => VMDB::Util.http_proxy_uri
-      )
+      options = {:path => '/oapi', :version => api_version}.merge(options)
+      kubernetes_connect(hostname, port, options)
     end
   end