Fixes #27565 - Ignore ansible collection whitelist

Katello · Aug 12, 2019 · cdafdd5 · cdafdd5
1 parent b941f99
commit cdafdd5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/app/models/katello/root_repository.rb b/app/models/katello/root_repository.rb
@@ -57,7 +57,8 @@ class RootRepository < Katello::Model
     validates_with Validators::ContainerImageNameValidator, :attributes => :docker_upstream_name, :allow_blank => true, :if => :docker?
 
     validate :ensure_valid_docker_attributes, :if => :docker?
-    validate :ensure_valid_ansible_collection_attributes, :if => :ansible_collection?
+    # To temporarily handle https://pulp.plan.io/issues/5250 and https://pulp.plan.io/issues/5251
+    #validate :ensure_valid_ansible_collection_attributes, :if => :ansible_collection?
     validate :ensure_docker_repo_unprotected, :if => :docker?
     validate :ensure_ostree_repo_protected, :if => :ostree?
     validate :ensure_compatible_download_policy, :if => :yum?

diff --git a/app/services/katello/pulp3/repository/ansible_collection.rb b/app/services/katello/pulp3/repository/ansible_collection.rb
@@ -32,7 +32,7 @@ def remote_options
           if root.url.blank?
             super
           else
-            common_remote_options.merge(url: root.url, whitelist: root.ansible_collection_whitelist)
+            common_remote_options.merge(url: root.url) # whitelist: root.ansible_collection_whitelist)
           end
         end
 

diff --git a/katello.gemspec b/katello.gemspec
@@ -44,7 +44,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "anemone"
   gem.add_dependency "pulpcore_client"
   gem.add_dependency "pulp_file_client", "< 3.0.0"
-  gem.add_dependency "pulp_ansible_client", "<= 0.2.0b2.dev01565187947"
+  gem.add_dependency "pulp_ansible_client"
   gem.add_dependency "pulp_docker_client"
 
   # UI