Fixes #30023: Add Katello config for Pulp 3 RPM

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

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/manifests/application.pp b/manifests/application.pp
@@ -9,13 +9,17 @@
 # @param use_pulp_2_for_docker
 #  Configure Katello to use Pulp 2 for docker content
 #
+# @param use_pulp_2_for_yum
+#  Configure Katello to use Pulp 2 for yum
+#
 # @param repo_export_dir
 #   Create a repository export directory for Katello to use
 #
 class katello::application (
   Integer[0] $rest_client_timeout = 3600,
   Boolean $use_pulp_2_for_file = false,
   Boolean $use_pulp_2_for_docker = false,
+  Boolean $use_pulp_2_for_yum = false,
   Stdlib::Absolutepath $repo_export_dir = '/var/lib/pulp/katello-export',
 ) {
   include foreman

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -95,6 +95,8 @@
 #
 # $use_pulp_2_for_docker:: Configures Katello to use Pulp 2 for docker content
 #
+# $use_pulp_2_for_yum::    Configures Katello to use Pulp 2 for yum content
+#
 class katello (
   Optional[String] $candlepin_oauth_key = undef,
   Optional[String] $candlepin_oauth_secret = undef,
@@ -116,6 +118,7 @@
 
   Boolean $use_pulp_2_for_file = false,
   Boolean $use_pulp_2_for_docker = false,
+  Boolean $use_pulp_2_for_yum = false,
 
   Stdlib::Absolutepath $repo_export_dir = '/var/lib/pulp/katello-export',
 
@@ -177,6 +180,7 @@
     rest_client_timeout   => $rest_client_timeout,
     use_pulp_2_for_file   => $use_pulp_2_for_file,
     use_pulp_2_for_docker => $use_pulp_2_for_docker,
+    use_pulp_2_for_yum    => $use_pulp_2_for_yum,
     repo_export_dir       => $repo_export_dir,
   }
 

diff --git a/spec/classes/application_spec.rb b/spec/classes/application_spec.rb
@@ -88,6 +88,7 @@ class { 'katello::params':
             '  :use_pulp_2_for_content_type:',
             '    :docker: false',
             '    :file: false',
+            '    :yum: false',
             '  :container_image_registry:',
             '    :crane_url: https://foo.example.com:5000',
             '    :crane_ca_cert_file: /etc/pki/katello/certs/katello-server-ca.crt'
@@ -151,6 +152,7 @@ class { 'katello::params':
             '  :use_pulp_2_for_content_type:',
             '    :docker: false',
             '    :file: false',
+            '    :yum: false',
             '  :container_image_registry:',
             '    :crane_url: https://foo.example.com:5000',
             '    :crane_ca_cert_file: /etc/pki/katello/certs/katello-server-ca.crt',
@@ -196,6 +198,7 @@ class {'katello::globals':
             '  :use_pulp_2_for_content_type:',
             '    :docker: false',
             '    :file: false',
+            '    :yum: false',
             '  :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
@@ -30,6 +30,7 @@
   :use_pulp_2_for_content_type:
     :docker: <%= @use_pulp_2_for_docker %>
     :file: <%= @use_pulp_2_for_file %>
+    :yum: <%= @use_pulp_2_for_yum %>
 
   # Internal configuration for communication from server to pulp crane service.
   :container_image_registry: