From e99d6c4b87542e3718c8320d0c653a606350c763 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Wed, 25 Aug 2021 17:44:38 +0200 Subject: [PATCH] Remove Apache as Puppet server environment owner This was needed when Pulp 2 (which ran as Apache) deployed environments. Now it no longer matters and it's up to the user, just like vanilla Foreman. --- config/foreman-proxy-content-answers.yaml | 1 - config/katello-answers.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/config/foreman-proxy-content-answers.yaml b/config/foreman-proxy-content-answers.yaml index 36a918634..85141d648 100644 --- a/config/foreman-proxy-content-answers.yaml +++ b/config/foreman-proxy-content-answers.yaml @@ -35,7 +35,6 @@ foreman_proxy::plugin::remote_execution::ssh: false foreman_proxy::plugin::shellhooks: false puppet: server: true - server_environments_owner: apache 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 diff --git a/config/katello-answers.yaml b/config/katello-answers.yaml index 35e23c0df..ee3fe72c1 100644 --- a/config/katello-answers.yaml +++ b/config/katello-answers.yaml @@ -94,7 +94,6 @@ foreman_proxy_content: {} katello: {} puppet: server: true - server_environments_owner: apache 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