Ensure foreman-proxy gets added on feature enable

Signed-off-by: Shubham Ganar <shubhamsg123m@gmail.com>

Author: shubhamsg199

src/filter_plugins/foremanctl.py

@@ -58,6 +58,17 @@ def get_dependencies(features):
     return dependencies
 
 
+def resolve_enabled_features(features):
+    """Resolve all features including implicit service dependencies."""
+    resolved = set(features)
+    for feature in list(features):
+        feature_meta = FEATURE_MAP.get(feature, {})
+        for base in BASE_FEATURES:
+            if base.replace('-', '_') in feature_meta and feature != base:
+                resolved.add(base)
+    return list(resolved)
+
+
 def foreman_plugins(value):
     dependencies = list(get_dependencies(filter_features(value)))
     plugins = [FEATURE_MAP.get(feature, {}).get('foreman', {}).get('plugin_name') for feature in filter_features(value + dependencies)]
@@ -100,8 +111,9 @@ def hammer_plugins(value):
 
 
 def foreman_proxy_plugins(value):
-    dependencies = list(get_dependencies(filter_features(value)))
-    plugins = [FEATURE_MAP.get(feature, {}).get('foreman_proxy', {}).get('plugin_name') for feature in filter_features(value + dependencies)]
+    proxy_features = [f for f in filter_features(value) if 'foreman_proxy' in FEATURE_MAP.get(f, {})]
+    dependencies = list(get_dependencies(proxy_features))
+    plugins = [FEATURE_MAP.get(feature, {}).get('foreman_proxy', {}).get('plugin_name') for feature in filter_features(proxy_features + dependencies)]
     return compact_list(plugins)
 
 
@@ -140,4 +152,5 @@ def filters(self):
             'has_feature': has_feature,
             'to_postgresql_databases': to_postgresql_databases,
             'to_postgresql_users': to_postgresql_users,
+            'resolve_enabled_features': resolve_enabled_features,
         }

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

@@ -1,3 +1,3 @@
 ---
 :enabled: {{ feature_enabled }}
-:template_url: {{ foreman_proxy_templates_url | default('http://' + ansible_facts['fqdn'] + ':8000') }}
+:template_url: {{ foreman_proxy_templates_url | default('http://' + ansible_facts['fqdn'] + ':8000') }}

src/vars/defaults.yml

@@ -4,4 +4,4 @@ database_mode: internal
 tuning: default
 flavor: katello
 features: []
-enabled_features: "{{ (flavor_features + features) }}"
+enabled_features: "{{ (flavor_features + features) | resolve_enabled_features }}"

tests/foreman_proxy_test.py

@@ -75,11 +75,6 @@ def test_bmc_default_provider(proxy_v2_features):
     assert settings.get('bmc_default_provider') == 'ipmitool'
 
 
-@pytest.mark.feature('templates')
-def test_templates_feature_enabled(proxy_v2_features):
-    assert 'templates' in proxy_v2_features
-
-
 @pytest.mark.feature('templates')
 def test_templates_template_url(proxy_v2_features):
     settings = proxy_v2_features['templates'].get('settings', {})