Add Templates feature to foreman-proxy

.github/workflows/test.yml

@@ -443,7 +443,9 @@ jobs:
             --certificate-bundle $(pwd)/.var/lib/foremanctl/proxy.example.com.tar.gz \
             --foreman-fqdn quadlet.example.com \
             --oauth-consumer-key $(cat .var/lib/foremanctl/foreman-oauth-consumer-key) \
-            --oauth-consumer-secret $(cat .var/lib/foremanctl/foreman-oauth-consumer-secret)
+            --oauth-consumer-secret $(cat .var/lib/foremanctl/foreman-oauth-consumer-secret) \
+            --templates-listen-on http \
+            --templates-url http://proxy.example.com:8000
       - name: Run tests
         run: |
           ./forge test --pytest-args="--server-hostname=proxy"

docs/user/parameters.md

@@ -128,6 +128,9 @@ There are multiple use cases from the users perspective that dictate what parame
 | `--add-feature content/ostree` | Enable OSTree content type | `--foreman-proxy-content-enable-ostree` |
 | `--bmc-ipmi-implementation` | IPMI implementation to use for BMC | `--foreman-proxy-bmc-default-provider` |
 | `--bmc-redfish-verify-ssl` | Verify SSL certificates for Redfish BMC connections | `--foreman-proxy-bmc-redfish-verify-ssl` |
+| `--add-feature templates` | Enable Templates feature on Smart Proxy | `--foreman-proxy-templates` |
+| `--templates-listen-on` | Templates proxy to listen on https, http, or both | `--foreman-proxy-templates-listen-on` |
+| `--templates-url` | URL that hosts will use to contact the proxy for provisioning templates | `--foreman-proxy-templates-url` |
 
 ### Undetermined
 
@@ -200,8 +203,6 @@ There are multiple use cases from the users perspective that dictate what parame
 | `--foreman-proxy-realm-provider` | | | |
 | `--foreman-proxy-registration` | | | |
 | `--foreman-proxy-registration-url` | | | |
-| `--foreman-proxy-templates` | | | |
-| `--foreman-proxy-template-url` | | | |
 | `--puppet-server` | | puppet | server |
 | `--puppet-server-ca` | | puppet | server_ca |
 | `--puppet-dns-alt-names` | | puppet | dns_alt_names |

src/features.yaml

@@ -71,3 +71,7 @@ webhooks:
   foreman:
     plugin_name: foreman_webhooks
   hammer: foreman_webhooks
+templates:
+  description: Templates feature for foreman-proxy
+  foreman_proxy:
+    plugin_name: templates

src/playbooks/_foreman_proxy/metadata.obsah.yaml

@@ -10,3 +10,13 @@ variables:
     parameter: --bmc-redfish-verify-ssl
     help: Verify SSL certificates for Redfish BMC connections.
     type: Boolean
+  foreman_proxy_templates_listen_on:
+    parameter: --templates-listen-on
+    help: Templates proxy to listen on https, http, or both.
+    choices:
+      - http
+      - https
+      - both
+  foreman_proxy_templates_url:
+    parameter: --templates-url
+    help: URL that hosts will use to contact the proxy for provisioning templates (e.g. http://<proxy-fqdn>:8000). Required when templates feature is enabled.

src/roles/foreman_proxy/defaults/main.yaml

@@ -18,6 +18,9 @@ foreman_proxy_disabled_features: "{{ foreman_proxy_available_features | differen
 
 foreman_proxy_foreman_server_url: "https://{{ ansible_facts['fqdn'] }}"
 
+# Templates settings
+foreman_proxy_templates_url: "http://{{ foreman_proxy_name }}:8000"
+
 # BMC settings
 foreman_proxy_bmc_ipmi_implementation: ipmitool
 foreman_proxy_bmc_redfish_verify_ssl: true

src/roles/foreman_proxy/templates/settings.d/templates.yml.j2

@@ -0,0 +1,4 @@
+---
+:enabled: {% if foreman_proxy_templates_listen_on | default('both') == 'both' %}true{% else %}{{ foreman_proxy_templates_listen_on }}{% endif %}
+
+:template_url: {{ foreman_proxy_templates_url }}

src/vars/flavors/foreman-proxy-content.yml

@@ -5,6 +5,7 @@ flavor_features:
   - content/container
   - content/ansible
   - content/python
+  - templates
 
 pulp_mirror: true
 pulp_rhsm_url: "https://{{ ansible_facts['fqdn'] }}/rhsm"

tests/feature/foreman-proxy/base_test.py

@@ -27,6 +27,10 @@ def test_foreman_proxy_features(curl_request, proxy_base_url, enabled_features):
         assert "bmc" in features
     else:
         assert "bmc" not in features
+    if 'templates' in enabled_features:
+        assert "templates" in features
+    else:
+        assert "templates" not in features
 
 
 def test_foreman_proxy_service(server):
@@ -65,3 +69,9 @@ def test_bmc_capabilities(proxy_v2_features):
 def test_bmc_default_provider(proxy_v2_features):
     settings = proxy_v2_features['bmc'].get('settings', {})
     assert settings.get('bmc_default_provider') == 'ipmitool'
+
+
+@pytest.mark.feature('templates')
+def test_templates_template_url(obsah_params, server_fqdn):
+    template_url = obsah_params.get('foreman_proxy_templates_url')
+    assert template_url == f'http://{server_fqdn}:8000'