Fixes #39281 - puppet_conf.erb permit setting ca_port

Signed-off-by: Pat Riehecky <riehecky@fnal.gov>

Author: jcpunk

app/services/foreman/renderer/configuration.rb

@@ -78,6 +78,7 @@ class Configuration
         :host_param, :host_param!,
         :host_puppet_server,
         :host_puppet_ca_server,
+        :host_puppet_ca_server_port,
         :host_puppet_environment,
         :host_enc,
         :install_packages,

app/services/foreman/renderer/scope/macros/host_template.rb

@@ -68,6 +68,14 @@ def host_puppet_ca_server
             host.try(:puppet_ca_server).presence || host_param('puppet_ca_server')
           end
 
+          apipie :method, 'Returns Puppet CA server\'s port configured through the ENC or the puppet_ca_server_port host parameter' do
+            returns String, desc: 'Returns the configured Puppet CA server\'s port, or nil if not configured'
+          end
+          def host_puppet_ca_server_port
+            check_host
+            host.try(:puppet_ca_server_port).presence || host_param('puppet_ca_server_port')
+          end
+
           apipie :method, 'Returns the Puppet environment configured configured through the ENC or the puppet_environment host parameter' do
             returns String, desc: 'Returns the configured Puppet environment name, or nil if not configured'
           end

app/views/unattended/provisioning_templates/snippet/puppet.conf.erb

@@ -48,6 +48,9 @@ report          = true
 <%- if host_puppet_ca_server.present? -%>
 ca_server       = <%= host_puppet_ca_server %>
 <%- end -%>
+<%- if host_puppet_ca_server_port.present? -%>
+ca_port       = <%= host_puppet_ca_server_port %>
+<%- end -%>
 certname        = <%= @host.certname %>
 <%- if host_puppet_server.present? -%>
 server          = <%= host_puppet_server %>

test/unit/foreman/renderer/scope/macros/host_template_test.rb

@@ -122,6 +122,21 @@ def host_info
     end
   end
 
+  describe '#host_puppet_ca_server_port' do
+    test 'should render puppet_ca_server_port' do
+      host = stub(puppet_ca_server_port: '443')
+      @scope.instance_variable_set('@host', host)
+      assert_equal @scope.host_puppet_ca_server_port, '443'
+    end
+
+    test 'should render puppet_ca_server_port parameter when puppet_ca_server_port not defined' do
+      host = stub(puppet_ca_server_port: '')
+      @scope.instance_variable_set('@host', host)
+      @scope.expects(:host_param).with('puppet_ca_server_port').returns('8080')
+      assert_equal @scope.host_puppet_ca_server_port, '8080'
+    end
+  end
+
   describe '#host_puppet_environment' do
     test 'should render environment' do
       host = stub(environment: 'production')