From cabe59a25a69183ddd87e8dd5af597dbd360a53d Mon Sep 17 00:00:00 2001 From: Justin Sherrill Date: Mon, 8 Jun 2020 11:29:11 -0400 Subject: [PATCH] Refs #30023 - Enable katello_applicability based on yum support --- spec/classes/application_spec.rb | 3 +++ templates/katello.yaml.erb | 2 ++ 2 files changed, 5 insertions(+) diff --git a/spec/classes/application_spec.rb b/spec/classes/application_spec.rb index b4b579be..6f766ded 100644 --- 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 index 9776b8fb..1a3b77f7 100644 --- 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 %>