Refs #35985 - Update Puppet enablement options

As part of a larger feature, this simplifies the options users need to pass to enable Puppet.
theforeman · Jan 24, 2023 · 0216dc3 · 0216dc3
1 parent 60e7925
commit 0216dc3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 20 deletions.
diff --git a/guides/common/modules/proc_enabling-puppet.adoc b/guides/common/modules/proc_enabling-puppet.adoc
@@ -15,24 +15,16 @@ Additionally, you can deploy Puppet server to {Project} externally and integrate
 --enable-foreman-cli-puppet \
 --foreman-proxy-puppet true \
 --foreman-proxy-puppetca true \
---foreman-proxy-content-puppet true \
 --enable-puppet \
---puppet-server true \
---puppet-server-foreman-ssl-ca /etc/pki/katello/puppet/puppet_client_ca.crt \
---puppet-server-foreman-ssl-cert /etc/pki/katello/puppet/puppet_client.crt \
---puppet-server-foreman-ssl-key /etc/pki/katello/puppet/puppet_client.key
+--puppet-server true
 ----
 . If you want to use Puppet integration on {SmartProxies}, enable Puppet integration and install Puppet server on {SmartProxies}:
 +
 [options="nowrap" subs="+quotes,attributes"]
 ----
 # {foreman-installer} --foreman-proxy-puppet true \
 --foreman-proxy-puppetca true \
---foreman-proxy-content-puppet true \
 --enable-puppet \
---puppet-server true \
---puppet-server-foreman-ssl-ca /etc/pki/katello/puppet/puppet_client_ca.crt \
---puppet-server-foreman-ssl-cert /etc/pki/katello/puppet/puppet_client.crt \
---puppet-server-foreman-ssl-key /etc/pki/katello/puppet/puppet_client.key \
+--puppet-server true
 --puppet-server-foreman-url "https://_{foreman-example-com}_"
 ----
diff --git a/...ule_Server_with_Custom_SSL_Certificates_and_with_Puppet_for_Load_Balancing.adoc b/...ule_Server_with_Custom_SSL_Certificates_and_with_Puppet_for_Load_Balancing.adoc
@@ -174,12 +174,8 @@ Retain a copy of the example `{foreman-installer}` command from the output for i
 --foreman-proxy-puppetca "true" \
 --puppet-server-ca "true" \
 --enable-foreman-proxy-plugin-remote-execution-script \
---foreman-proxy-content-puppet true \
 --enable-puppet \
---puppet-server true \
---puppet-server-foreman-ssl-ca /etc/pki/katello/puppet/puppet_client_ca.crt \
---puppet-server-foreman-ssl-cert /etc/pki/katello/puppet/puppet_client.crt \
---puppet-server-foreman-ssl-key /etc/pki/katello/puppet/puppet_client.key
+--puppet-server true
 ----
 
 . On {SmartProxyServer}, generate Puppet certificates for all other {SmartProxies} that you configure for load balancing, except this first system where you configure Puppet certificates signing:

diff --git a/...apsule_Server_with_Default_SSL_Certificates_for_Load_Balancing_with_Puppet.adoc b/...apsule_Server_with_Default_SSL_Certificates_for_Load_Balancing_with_Puppet.adoc
@@ -66,12 +66,8 @@ root@_{smart-proxy-context}-ca.example.com_:__{smart-proxy-context}-ca.example.c
 --foreman-proxy-puppetca "true" \
 --puppet-server-ca "true" \
 --enable-foreman-proxy-plugin-remote-execution-script \
---foreman-proxy-content-puppet true \
 --enable-puppet \
---puppet-server true \
---puppet-server-foreman-ssl-ca /etc/pki/katello/puppet/puppet_client_ca.crt \
---puppet-server-foreman-ssl-cert /etc/pki/katello/puppet/puppet_client.crt \
---puppet-server-foreman-ssl-key /etc/pki/katello/puppet/puppet_client.key
+--puppet-server true
 ----
 
 . On {SmartProxyServer}, stop the Puppet server: