Refs #28695: Add Pulp 2 migration settings

theforeman · Jan 16, 2020 · f9f510e · f9f510e
1 parent 37104d7
commit f9f510e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/manifests/globals.pp b/manifests/globals.pp
@@ -25,6 +25,8 @@
   Boolean $enable_puppet = true,
   Boolean $enable_docker = true,
   Boolean $enable_deb = true,
+  Boolean use_pulp_2_for_file = true,
+  Boolean use_pulp_2_for_docker = true,
 ) {
   if versioncmp($facts['operatingsystemmajrelease'], '8') >= 0 {
     $rubygem_katello = 'rubygem-katello'

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -162,6 +162,8 @@
     enable_puppet => $enable_puppet,
     enable_docker => $enable_docker,
     enable_deb    => $enable_deb,
+    use_pulp_2_for_file => true,
+    use_pulp_2_for_docker => true,
   }
 
   class { 'katello::params':

diff --git a/templates/katello.yaml.erb b/templates/katello.yaml.erb
@@ -25,6 +25,10 @@
     :url: <%= @pulp_url %>
     :ca_cert_file: <%= @pulp_ca_cert %>
 
+  :use_pulp_2_for_content_type:
+    :docker: <%= @use_pulp_2_for_docker %>
+    :file: <%= @use_pulp_2_for_file %>
+
   :qpid:
     :url: <%= @qpid_url %>
     :subscriptions_queue_address: <%= @candlepin_event_queue %>