diff --git a/manifests/globals.pp b/manifests/globals.pp index a363be0c..3d797ed7 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 = false, + Boolean use_pulp_2_for_docker = false, ) { if versioncmp($facts['operatingsystemmajrelease'], '8') >= 0 { $rubygem_katello = 'rubygem-katello' diff --git a/manifests/init.pp b/manifests/init.pp index b85e81f1..9c473a96 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -125,6 +125,9 @@ Boolean $enable_docker = true, Boolean $enable_deb = true, + Boolean $use_pulp_2_for_file = $use_pulp_2_for_file, + Boolean $use_pulp_2_for_docker = $use_pulp_2_for_docker, + Stdlib::Absolutepath $repo_export_dir = '/var/lib/pulp/katello-export', String $candlepin_db_host = 'localhost', @@ -156,12 +159,14 @@ } class { 'katello::globals': - enable_ostree => $enable_ostree, - enable_yum => $enable_yum, - enable_file => $enable_file, - enable_puppet => $enable_puppet, - enable_docker => $enable_docker, - enable_deb => $enable_deb, + enable_ostree => $enable_ostree, + enable_yum => $enable_yum, + enable_file => $enable_file, + enable_puppet => $enable_puppet, + enable_docker => $enable_docker, + enable_deb => $enable_deb, + use_pulp_2_for_file => $use_pulp_2_for_file, + use_pulp_2_for_docker => $use_pulp_2_for_docker, } 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 %>