Merge pull request #13317 from cben/container_supported_auth_attributes

Fix creating Kubernetes or OSE with `credentials.auth_key`
ManageIQ · Feb 16, 2017 · fad636d · fad636d
2 parents b95585e + 76548ed
commit fad636d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/app/models/manageiq/providers/kubernetes/container_manager_mixin.rb b/app/models/manageiq/providers/kubernetes/container_manager_mixin.rb
@@ -90,6 +90,10 @@ def required_credential_fields(_type)
     [:auth_key]
   end
 
+  def supported_auth_attributes
+    %w(userid password auth_key)
+  end
+
   def verify_credentials(auth_type = nil, options = {})
     options = options.merge(:auth_type => auth_type)
     if options[:auth_type].to_s == "hawkular"

diff --git a/app/models/manageiq/providers/openshift/container_manager.rb b/app/models/manageiq/providers/openshift/container_manager.rb
@@ -20,10 +20,6 @@ def self.event_monitor_class
     ManageIQ::Providers::Openshift::ContainerManager::EventCatcher
   end
 
-  def supported_auth_attributes
-    %w(userid password auth_key)
-  end
-
   def create_project(project)
     connect.create_project_request(project)
   rescue KubeException => e

diff --git a/spec/requests/api/providers_spec.rb b/spec/requests/api/providers_spec.rb
@@ -370,8 +370,6 @@ def have_endpoint_attributes(expected_hash)
         let(:containers_class) { klass }
 
         it "supports creation with auth_key specified" do
-          skip if name != "Openshift"
-
           api_basic_authorize collection_action_identifier(:providers, :create)
 
           run_post(providers_url, sample_containers.merge("credentials" => [containers_credentials]))