Fixes #33337 - Do not enable Puppet infrastructure by default for Kat…

…ello scenario
ekohl · Nov 2, 2021 · a948a12 · a948a12
1 parent b75531b
commit a948a12
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 20 deletions.
diff --git a/config/foreman-proxy-content-answers.yaml b/config/foreman-proxy-content-answers.yaml
@@ -13,6 +13,7 @@ certs:
   generate: false
 foreman_proxy_content:
   pulpcore_mirror: true
+  puppet: false
 foreman_proxy:
   foreman_ssl_ca: /etc/foreman-proxy/foreman_ssl_ca.pem
   foreman_ssl_cert: /etc/foreman-proxy/foreman_ssl_cert.pem
@@ -24,6 +25,8 @@ foreman_proxy:
   ssl_key: /etc/foreman-proxy/ssl_key.pem
   ssl_port: '9090'
   templates: true
+  puppet: false
+  puppetca: false
 foreman_proxy::plugin::acd: false
 foreman_proxy::plugin::ansible: false
 foreman_proxy::plugin::dhcp::infoblox: false
@@ -34,11 +37,4 @@ foreman_proxy::plugin::reports: false
 foreman_proxy::plugin::openscap: false
 foreman_proxy::plugin::remote_execution::ssh: false
 foreman_proxy::plugin::shellhooks: false
-puppet:
-  server: true
-  server_foreman_ssl_ca: /etc/pki/katello/puppet/puppet_client_ca.crt
-  server_foreman_ssl_cert: /etc/pki/katello/puppet/puppet_client.crt
-  server_foreman_ssl_key: /etc/pki/katello/puppet/puppet_client.key
-  server_jvm_extra_args:
-    - "-Djruby.logger.class=com.puppetlabs.jruby_utils.jruby.Slf4jLogger"
-    - "-XX:ReservedCodeCacheSize=512m"
+puppet: false
diff --git a/config/katello-answers.yaml b/config/katello-answers.yaml
@@ -29,7 +29,7 @@ foreman::cli::discovery: false
 foreman::cli::katello: true
 foreman::cli::kubevirt: false
 foreman::cli::openscap: false
-foreman::cli::puppet: true
+foreman::cli::puppet: false
 foreman::cli::remote_execution: true
 foreman::cli::tasks: false
 foreman::cli::templates: false
@@ -57,7 +57,7 @@ foreman::plugin::leapp: false
 foreman::plugin::memcache: false
 foreman::plugin::monitoring: false
 foreman::plugin::openscap: false
-foreman::plugin::puppet: true
+foreman::plugin::puppet: false
 foreman::plugin::puppetdb: false
 foreman::plugin::remote_execution: true
 foreman::plugin::remote_execution::cockpit: false
@@ -79,6 +79,8 @@ foreman_proxy:
   ssl_cert: /etc/foreman-proxy/ssl_cert.pem
   ssl_key: /etc/foreman-proxy/ssl_key.pem
   ssl_port: '9090'
+  puppet: false
+  puppetca: false
 foreman_proxy::plugin::acd: false
 foreman_proxy::plugin::ansible: false
 foreman_proxy::plugin::chef: false
@@ -94,11 +96,4 @@ foreman_proxy::plugin::salt: false
 foreman_proxy::plugin::shellhooks: false
 foreman_proxy_content: true
 katello: true
-puppet:
-  server: true
-  server_foreman_ssl_ca: /etc/pki/katello/puppet/puppet_client_ca.crt
-  server_foreman_ssl_cert: /etc/pki/katello/puppet/puppet_client.crt
-  server_foreman_ssl_key: /etc/pki/katello/puppet/puppet_client.key
-  server_jvm_extra_args:
-    - "-Djruby.logger.class=com.puppetlabs.jruby_utils.jruby.Slf4jLogger"
-    - "-XX:ReservedCodeCacheSize=512m"
+puppet: false
diff --git a/katello_certs/hooks/boot/02-message-helpers.rb b/katello_certs/hooks/boot/02-message-helpers.rb
@@ -62,8 +62,7 @@ def proxy_instructions_message(kafo)
                     --foreman-proxy-trusted-hosts                 "#{fqdn}"\\
                     --foreman-proxy-trusted-hosts                 "#{foreman_proxy_fqdn}"\\
                     --foreman-proxy-oauth-consumer-key            "#{foreman_oauth_key}"\\
-                    --foreman-proxy-oauth-consumer-secret         "#{foreman_oauth_secret}"\\
-                    --puppet-server-foreman-url                   "#{foreman_url}"
+                    --foreman-proxy-oauth-consumer-secret         "#{foreman_oauth_secret}"
 MSG
   end
 end