Fixes #30360: Drop Pulp 2 and Qpid #356
Conversation
|
Related to theforeman/puppet-foreman_proxy_content#271 but does not have the same level of re-factoring impact since all Pulpcore configuration exists over in puppet-foreman_proxy_content. @jlsherrill can you look and make sure the |
| Boolean $use_pulp_2_for_file = false, | ||
| Boolean $use_pulp_2_for_docker = false, | ||
| Boolean $use_pulp_2_for_yum = false, |
There was a problem hiding this comment.
These can be dropped as well if there's no Pulp 2.
There was a problem hiding this comment.
I agree they ought to be dropped, just waiting for confirmation from @jlsherrill that they have been dropped code-wise inside Katello.
There was a problem hiding this comment.
The code suggests that if it's not present, it equals to false so should be safe to drop:
https://github.com/Katello/katello/blob/cf1bf09002252669c997b6317868582d2c35b465/app/models/katello/concerns/smart_proxy_extensions.rb#L149-L156
| @@ -20,7 +20,6 @@ | |||
| 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', | |||
There was a problem hiding this comment.
Please also drop the docs for this one
| :content_types: | ||
| :file: <%= @enable_file %> | ||
| :yum: <%= @enable_yum %> | ||
| :deb: <%= @enable_deb %> | ||
| :puppet: <%= @enable_puppet %> | ||
| :docker: <%= @enable_docker %> | ||
| :ostree: <%= @enable_ostree %> | ||
| :docker: <%= @enable_container %> |
There was a problem hiding this comment.
AFAIK content types are Pulp 2 only. With Pulp 3 they're discovered via capabilities in the Smart Proxy
There was a problem hiding this comment.
these are technically still needed as this tells katello what nav items to show, and what type of repositories can be created. We could look into looking at the smart proxy for this, but aren't currently.
There was a problem hiding this comment.
Can we open an issue for that to track? From the installer side we want as little configuration as possible and a more dynamic application would be the result.
| @@ -24,7 +21,6 @@ | |||
| :ssl_ca_file: <%= @candlepin_ca_cert %> | |||
|
|
|||
| :pulp: | |||
| :url: <%= @pulp_url %> | |||
| :ca_cert_file: <%= @pulp_ca_cert %> | |||
|
|
|||
| :use_pulp_2_for_content_type: | |||
There was a problem hiding this comment.
Feels like this could be removed as well
| @@ -33,8 +29,3 @@ | |||
| :yum: <%= @use_pulp_2_for_yum %> | |||
|
|
|||
| :katello_applicability: <%= !@use_pulp_2_for_yum %> | |||
There was a problem hiding this comment.
this could just be set to 'true' for now
No description provided.