Fixes #34708 - configure certs for the katello agent broker

theforeman · Apr 1, 2022 · d5cad7f · d5cad7f
1 parent 6f5794b
commit d5cad7f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/manifests/application.pp b/manifests/application.pp
@@ -37,6 +37,9 @@
   # Used in katello.yaml.erb
   $agent_broker_url = $katello::params::qpid_url
   $agent_event_queue_name = $katello::params::agent_event_queue_name
+  $agent_broker_client_key = $certs::foreman::client_key
+  $agent_broker_client_cert = $certs::foreman::client_cert
+  $agent_broker_ca_cert = $certs::ca_cert
   $enable_katello_agent = $katello::params::enable_katello_agent
   $candlepin_url = $katello::params::candlepin_url
   $candlepin_oauth_key = $katello::params::candlepin_oauth_key

diff --git a/spec/classes/application_spec.rb b/spec/classes/application_spec.rb
@@ -142,6 +142,9 @@ class {'katello::globals':
             '  :agent:',
             '    :enabled: true',
             '    :broker_url: amqps://localhost:5671',
+            '    :broker_ssl_cert_file: /etc/foreman/client_cert.pem',
+            '    :broker_ssl_key_file: /etc/foreman/client_key.pem',
+            '    :broker_ssl_ca_file: /etc/pki/katello/certs/katello-default-ca.crt',
             '    :event_queue_name: katello.agent',
           ]
         end
@@ -195,6 +198,9 @@ class {'katello::globals':
             '  :agent:',
             '    :enabled: true',
             '    :broker_url: amqps://localhost:5671',
+            '    :broker_ssl_cert_file: /etc/foreman/client_cert.pem',
+            '    :broker_ssl_key_file: /etc/foreman/client_key.pem',
+            '    :broker_ssl_ca_file: /etc/pki/katello/certs/katello-default-ca.crt',
             '    :event_queue_name: katello.agent',
           ]
         end

diff --git a/templates/katello.yaml.erb b/templates/katello.yaml.erb
@@ -19,5 +19,8 @@
     :enabled: <%= @enable_katello_agent %>
     <%- if @enable_katello_agent -%>
     :broker_url: <%= @agent_broker_url %>
+    :broker_ssl_cert_file: <%= @agent_broker_client_cert %>
+    :broker_ssl_key_file: <%= @agent_broker_client_key %>
+    :broker_ssl_ca_file: <%= @agent_broker_ca_cert %>
     :event_queue_name: <%= @agent_event_queue_name %>
     <%- end -%>