From f9f510e628488e31e9537e44f1d0de4a62532827 Mon Sep 17 00:00:00 2001 From: "Eric D. Helms" Date: Thu, 16 Jan 2020 14:04:41 -0500 Subject: [PATCH] Refs #28695: Add Pulp 2 migration settings --- manifests/globals.pp | 2 ++ manifests/init.pp | 2 ++ templates/katello.yaml.erb | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/manifests/globals.pp b/manifests/globals.pp index a363be0c..5d595092 100644 --- 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 index b85e81f1..99d87cd5 100644 --- 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 index 8d71c662..061b3b93 100644 --- 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 %>