Fix DHCP KEA settings

Author: archanaserver

src/features.yaml

@@ -48,7 +48,7 @@ bmc:
   description: Power management for bare metal hosts (IPMI, Redfish)
   foreman_proxy:
     plugin_name: bmc
-dhcp-kea-external:
-  description: KEA DHCP provider (external unmanaged server)
+dhcp:
+  description: DHCP management
   foreman_proxy:
-    plugin_name: dhcp_kea_api
+    plugin_name: dhcp

src/roles/foreman_proxy/defaults/main.yaml

@@ -24,7 +24,11 @@ foreman_proxy_foreman_server_url: "https://{{ ansible_facts['fqdn'] }}"
 foreman_proxy_bmc_ipmi_implementation: ipmitool
 foreman_proxy_bmc_redfish_verify_ssl: true
 
-# KEA DHCP settings (external unmanaged server)
-foreman_proxy_dhcp_kea_server: localhost
-foreman_proxy_dhcp_kea_url: "http://{{ foreman_proxy_dhcp_kea_server }}:8000"
-foreman_proxy_dhcp_kea_subnet: 192.168.0.0/24
+# DHCP settings
+foreman_proxy_dhcp_provider: dhcp_kea
+foreman_proxy_dhcp_subnets: []
+
+# KEA DHCP provider settings (when foreman_proxy_dhcp_provider is dhcp_kea)
+foreman_proxy_dhcp_kea_api_url: "{{ undef(hint='You must specify the KEA API URL') }}"
+foreman_proxy_dhcp_kea_api_username: ""
+foreman_proxy_dhcp_kea_api_password: ""

src/roles/foreman_proxy/tasks/feature/dhcp.yaml

@@ -0,0 +1,21 @@
+- name: Create config secret for DHCP provider {{ foreman_proxy_dhcp_provider }}
+  containers.podman.podman_secret:
+    state: present
+    name: foreman-proxy-{{ foreman_proxy_dhcp_provider }}-yml
+    data: "{{ lookup('ansible.builtin.template', 'settings.d/' + foreman_proxy_dhcp_provider + '.yml.j2') }}"
+  notify:
+    - Restart Foreman Proxy
+    - Refresh Foreman Proxy
+
+- name: Mount config secret for DHCP provider {{ foreman_proxy_dhcp_provider }}
+  ansible.builtin.copy:
+    dest: /etc/containers/systemd/foreman-proxy.container.d/{{ foreman_proxy_dhcp_provider }}.conf
+    content: |
+      [Container]
+      Secret=foreman-proxy-{{ foreman_proxy_dhcp_provider }}-yml,type=mount,target=/etc/foreman-proxy/settings.d/{{ foreman_proxy_dhcp_provider }}.yml
+    mode: '0644'
+    owner: root
+    group: root
+  notify:
+    - Restart Foreman Proxy
+    - Refresh Foreman Proxy

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

@@ -0,0 +1,9 @@
+---
+# DHCP module configuration
+# This enables the DHCP module and selects the provider
+
+:enabled: {{ feature_enabled }}
+:use_provider: {{ foreman_proxy_dhcp_provider }}
+{% if foreman_proxy_dhcp_subnets is defined and foreman_proxy_dhcp_subnets %}
+:subnets: {{ foreman_proxy_dhcp_subnets | to_json }}
+{% endif %}

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

@@ -0,0 +1,18 @@
+---
+# KEA DHCP provider configuration
+# This configures Smart Proxy to use an external KEA DHCP server
+
+:enabled: {{ feature_enabled }}
+:kea_api_url: {{ foreman_proxy_dhcp_kea_api_url }}
+{% if foreman_proxy_dhcp_kea_api_username is defined and foreman_proxy_dhcp_kea_api_username %}
+:kea_api_username: {{ foreman_proxy_dhcp_kea_api_username }}
+{% endif %}
+{% if foreman_proxy_dhcp_kea_api_password is defined and foreman_proxy_dhcp_kea_api_password %}
+:kea_api_password: {{ foreman_proxy_dhcp_kea_api_password }}
+{% endif %}
+{% if foreman_proxy_dhcp_subnets is defined and foreman_proxy_dhcp_subnets %}
+:managed_subnets:
+{% for subnet in foreman_proxy_dhcp_subnets %}
+  - {{ subnet }}
+{% endfor %}
+{% endif %}

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

@@ -29,7 +29,7 @@ def test_foreman_proxy_features(server, certificates, server_fqdn, enabled_featu
         assert "bmc" in features
     else:
         assert "bmc" not in features
-    if 'dhcp-kea-external' in enabled_features:
+    if 'dhcp' in enabled_features:
         assert "dhcp" in features
     else:
         assert "dhcp" not in features
@@ -75,24 +75,24 @@ def test_bmc_default_provider(proxy_v2_features):
     assert settings.get('bmc_default_provider') == 'ipmitool'
 
 
-@pytest.mark.feature('dhcp-kea-external')
-def test_dhcp_kea_feature_present(proxy_v2_features):
+@pytest.mark.feature('dhcp')
+def test_dhcp_feature_present(proxy_v2_features):
     assert 'dhcp' in proxy_v2_features
 
 
-@pytest.mark.feature('dhcp-kea-external')
-def test_dhcp_kea_provider(proxy_v2_features):
+@pytest.mark.feature('dhcp')
+def test_dhcp_provider(proxy_v2_features):
     assert 'dhcp' in proxy_v2_features
     settings = proxy_v2_features['dhcp'].get('settings', {})
-    assert settings.get('use_provider') == 'dhcp_kea_api'
+    assert settings.get('use_provider') == 'dhcp_kea'
 
 
-@pytest.mark.feature('dhcp-kea-external')
-def test_dhcp_kea_server_settings(proxy_v2_features):
+@pytest.mark.feature('dhcp')
+def test_dhcp_kea_api_settings(proxy_v2_features):
     assert 'dhcp' in proxy_v2_features
     settings = proxy_v2_features['dhcp'].get('settings', {})
-    assert 'server' in settings
-    assert 'kea_url' in settings
-    assert settings['kea_url'].endswith(':8000')
-    assert 'kea_subnet' in settings
-    assert '/' in settings['kea_subnet']
+    assert 'kea_api_url' in settings
+    assert settings['kea_api_url'].endswith(':8000')
+    if settings.get('managed_subnets'):
+        assert isinstance(settings['managed_subnets'], list)
+        assert all('/' in subnet for subnet in settings['managed_subnets'])