Refs #30023 - Enable katello_applicability based on yum support

theforeman · Jun 8, 2020 · cabe59a · cabe59a
1 parent 6e4719a
commit cabe59a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/spec/classes/application_spec.rb b/spec/classes/application_spec.rb
@@ -89,6 +89,7 @@ class { 'katello::params':
             '    :docker: false',
             '    :file: false',
             '    :yum: false',
+            '  :katello_applicability: true',
             '  :container_image_registry:',
             '    :crane_url: https://foo.example.com:5000',
             '    :crane_ca_cert_file: /etc/pki/katello/certs/katello-server-ca.crt'
@@ -153,6 +154,7 @@ class { 'katello::params':
             '    :docker: false',
             '    :file: false',
             '    :yum: false',
+            '  :katello_applicability: true',
             '  :container_image_registry:',
             '    :crane_url: https://foo.example.com:5000',
             '    :crane_ca_cert_file: /etc/pki/katello/certs/katello-server-ca.crt',
@@ -199,6 +201,7 @@ class {'katello::globals':
             '    :docker: false',
             '    :file: false',
             '    :yum: false',
+            '  :katello_applicability: true',
             '  :container_image_registry:',
             '    :crane_url: https://foo.example.com:5000',
             '    :crane_ca_cert_file: /etc/pki/katello/certs/katello-server-ca.crt'

diff --git a/templates/katello.yaml.erb b/templates/katello.yaml.erb
@@ -32,6 +32,8 @@
     :file: <%= @use_pulp_2_for_file %>
     :yum: <%= @use_pulp_2_for_yum %>
 
+  :katello_applicability: <%= !@use_pulp_2_for_yum %>
+
   # Internal configuration for communication from server to pulp crane service.
   :container_image_registry:
     :crane_url: <%= @crane_url %>