From 713cbc0d1dca9a6adcad619009bdc495012c200b Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Sat, 29 Aug 2026 16:59:54 +0200 Subject: [PATCH 1/2] Only deploy Pulp Apache rules when Pulp is enabled --- src/roles/httpd/templates/foreman-ssl-vhost.conf.j2 | 4 ++++ src/roles/httpd/templates/foreman-vhost.conf.j2 | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/roles/httpd/templates/foreman-ssl-vhost.conf.j2 b/src/roles/httpd/templates/foreman-ssl-vhost.conf.j2 index 0ed71faa5..e2b8f4150 100644 --- a/src/roles/httpd/templates/foreman-ssl-vhost.conf.j2 +++ b/src/roles/httpd/templates/foreman-ssl-vhost.conf.j2 @@ -61,6 +61,7 @@ {% endif %} +{% if httpd_with_pulpcore %} ProxyPass /pulp_ansible/galaxy/ {{ httpd_pulp_api_backend }}/pulp_ansible/galaxy/ ProxyPassReverse /pulp_ansible/galaxy/ {{ httpd_pulp_api_backend }}/pulp_ansible/galaxy/ @@ -106,6 +107,7 @@ ProxyPass {{ httpd_pulp_api_backend }}/pulp/api/v3 timeout=600 ProxyPassReverse {{ httpd_pulp_api_backend }}/pulp/api/v3 +{% endif %} Alias /pub {{ httpd_pub_dir }} @@ -114,8 +116,10 @@ Require all granted +{% if httpd_with_pulpcore %} ProxyPass /pulp/assets/ {{ httpd_pulp_api_backend }}/pulp/assets/ ProxyPassReverse /pulp/assets/ {{ httpd_pulp_api_backend }}/pulp/assets/ +{% endif %} ## Proxy rules ProxyRequests Off diff --git a/src/roles/httpd/templates/foreman-vhost.conf.j2 b/src/roles/httpd/templates/foreman-vhost.conf.j2 index 74b57c463..fc7d405b3 100644 --- a/src/roles/httpd/templates/foreman-vhost.conf.j2 +++ b/src/roles/httpd/templates/foreman-vhost.conf.j2 @@ -38,6 +38,7 @@ RequestHeader unset REMOTE_USER-GROUPS RequestHeader unset REMOTE_USER_GROUPS {% endif %} +{% if httpd_with_pulpcore %} RequestHeader unset X-CLIENT-CERT @@ -54,6 +55,7 @@ ProxyPass {{ httpd_pulp_content_backend }}/pulp/content disablereuse=on timeout=600 ProxyPassReverse {{ httpd_pulp_content_backend }}/pulp/content +{% endif %} Alias /pub {{ httpd_pub_dir }} From 61da01fc1261b997898b93429ca8347437f6e807 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Fri, 15 May 2026 14:09:40 +0200 Subject: [PATCH 2/2] Introduce a plain Foreman flavor This moves Candlepin and Pulp behind the feature flags. Candlepin is only deployed on Foreman with Katello servers while Pulp is deployed on Katello enabled servers. --- src/playbooks/deploy/metadata.obsah.yaml | 1 + src/vars/flavors/foreman.yml | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 src/vars/flavors/foreman.yml diff --git a/src/playbooks/deploy/metadata.obsah.yaml b/src/playbooks/deploy/metadata.obsah.yaml index ca9bfed5c..e47c71ed7 100644 --- a/src/playbooks/deploy/metadata.obsah.yaml +++ b/src/playbooks/deploy/metadata.obsah.yaml @@ -7,6 +7,7 @@ variables: help: Base flavor to use in this deployment. choices: - katello + - foreman external_authentication: help: External authentication method to use choices: diff --git a/src/vars/flavors/foreman.yml b/src/vars/flavors/foreman.yml new file mode 100644 index 000000000..ca1737835 --- /dev/null +++ b/src/vars/flavors/foreman.yml @@ -0,0 +1,22 @@ +--- +flavor_features: + - foreman + +checks_to_execute: + - check_features + - check_hostname + - check_database_connection + # TODO: this requires 20 GB RAM but plain Foreman can work with a lot less + #- check_system_requirements + - check_podman_network_backend + +health_checks_to_execute: + - check_hostname + - check_database_connection + - check_services + - check_foreman_api + - check_foreman_tasks + - check_host_facts_count + - check_duplicate_permissions + +post_install_message_enabled: true