Skip to content

Commit

Permalink
Fixes #35868 - Stop using Katello unconditionally
Browse files Browse the repository at this point in the history
This should limit the use of the `Host#katello_agent_enable?` method to
only when the Katello plugin is actually present on the Foreman install
  • Loading branch information
ananace authored and ekohl committed Dec 16, 2022
1 parent 34728ae commit 7560fdf
Showing 1 changed file with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ description: |
<% if registration_type == 'subscription_manager' %>
<%
atomic = @host.operatingsystem.respond_to?(:atomic) ? @host.operatingsystem.atomic? : host_param_true?('atomic')
redhat_install_agent = host_param_true?('redhat_install_agent', katello_agent_enabled?)
redhat_install_agent_fallback = plugin_present?('katello') && katello_agent_enabled?
redhat_install_agent = host_param_true?('redhat_install_agent', redhat_install_agent_fallback)

if host_param('kt_activation_keys')
subscription_manager_certpkg_url = subscription_manager_configuration_url(@host)
Expand Down

0 comments on commit 7560fdf

Please sign in to comment.