Fix the inclusion of kea_*_raw_options

This produced invalid syntax before, but should now work as expected.
JonasAlfredsson · Jun 13, 2024 · 0886b10 · 0886b10
1 parent bf5e1c7
commit 0886b10
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/templates/dhcp4.json.j2 b/templates/dhcp4.json.j2
@@ -35,10 +35,10 @@
         "renew-timer": {{ kea_dhcp4_renew_timer | int }},
         "rebind-timer": {{ kea_dhcp4_rebind_timer | int }},
 
-{% if kea_dhcp4_raw_options | length > 0 %}
-        {{ kea_dhcp4_raw_options | to_nice_json(indent=4, ensure_ascii=False ) | indent(8, False) }}
+{% for key, value in kea_dhcp4_raw_options.items() %}
+        "{{ key }}": {{ value | to_nice_json(indent=4, ensure_ascii=False) | indent(8, False) }},
 
-{% endif %}
+{% endfor %}
         // We include the subnet file separately to make this one less cluttered.
         <?include "/kea/config/subnet4.json"?>
 

diff --git a/templates/dhcp6.json.j2 b/templates/dhcp6.json.j2
@@ -34,10 +34,10 @@
         "renew-timer": {{ kea_dhcp6_renew_timer | int }},
         "rebind-timer": {{ kea_dhcp6_rebind_timer | int }},
 
-{% if kea_dhcp6_raw_options | length > 0 %}
-        {{ kea_dhcp6_raw_options | to_nice_json(indent=4, ensure_ascii=False ) | indent(8, False) }}
+{% for key, value in kea_dhcp6_raw_options.items() %}
+        "{{ key }}": {{ value | to_nice_json(indent=4, ensure_ascii=False) | indent(8, False) }},
 
-{% endif %}
+{% endfor %}
         // We include the subnet file separately to make this one less cluttered.
         <?include "/kea/config/subnet6.json"?>