4 files changed, 16 insertions, 14 deletions
diff --git a/data/templates/dhcp-relay/dhcrelay.conf.tmpl b/data/templates/dhcp-relay/dhcrelay.conf.j2
index 11710bd8e..11710bd8e 100644
--- a/data/templates/dhcp-relay/dhcrelay.conf.tmpl
+++ b/data/templates/dhcp-relay/dhcrelay.conf.j2
diff --git a/data/templates/dhcp-relay/dhcrelay6.conf.tmpl b/data/templates/dhcp-relay/dhcrelay6.conf.j2
index 1fd5de18c..6365346b4 100644
--- a/data/templates/dhcp-relay/dhcrelay6.conf.tmpl
+++ b/data/templates/dhcp-relay/dhcrelay6.conf.j2
@@ -3,18 +3,18 @@
 {# upstream_interface is mandatory so it's always present #}
 {% set upstream = namespace(value='')  %}
 {% for interface, config in upstream_interface.items() %}
-{%   for address in config.address %}
-{%     set upstream.value = upstream.value ~ '-u ' ~ address ~ '%' ~ interface ~ ' ' %}
-{%   endfor %}
+{%     for address in config.address %}
+{%         set upstream.value = upstream.value ~ '-u ' ~ address ~ '%' ~ interface ~ ' ' %}
+{%     endfor %}
 {% endfor %}
 {# listen_interface is mandatory so it's always present #}
 {% set listen = namespace(value='')  %}
 {% for interface, config in listen_interface.items() %}
-{%   if config.address is vyos_defined %}
-{%     set listen.value = listen.value ~ '-l ' ~ config.address ~ '%' ~ interface ~ ' ' %}
-{%   else %}
-{%     set listen.value = listen.value ~ '-l ' ~ interface ~ ' ' %}
-{%   endif %}
+{%     if config.address is vyos_defined %}
+{%         set listen.value = listen.value ~ '-l ' ~ config.address ~ '%' ~ interface ~ ' ' %}
+{%     else %}
+{%         set listen.value = listen.value ~ '-l ' ~ interface ~ ' ' %}
+{%     endif %}
 {% endfor %}
 
 OPTIONS="{{ listen.value }} {{ upstream.value }} -c {{ max_hop_count }} {{ '-I' if use_interface_id_option is vyos_defined }}"
diff --git a/src/conf_mode/dhcp_relay.py b/src/conf_mode/dhcp_relay.py
index 6352e0b4a..4de2ca2f3 100755
--- a/src/conf_mode/dhcp_relay.py
+++ b/src/conf_mode/dhcp_relay.py
@@ -66,18 +66,19 @@ def generate(relay):
     if not relay:
         return None
 
-    render(config_file, 'dhcp-relay/dhcrelay.conf.tmpl', relay)
+    render(config_file, 'dhcp-relay/dhcrelay.conf.j2', relay)
     return None
 
 def apply(relay):
     # bail out early - looks like removal from running config
+    service_name = 'isc-dhcp-relay.service'
     if not relay:
-        call('systemctl stop isc-dhcp-relay.service')
+        call(f'systemctl stop {service_name}')
         if os.path.exists(config_file):
             os.unlink(config_file)
         return None
 
-    call('systemctl restart isc-dhcp-relay.service')
+    call(f'systemctl restart {service_name}')
 
     return None
 
diff --git a/src/conf_mode/dhcpv6_relay.py b/src/conf_mode/dhcpv6_relay.py
index aea2c3b73..c1bd51f62 100755
--- a/src/conf_mode/dhcpv6_relay.py
+++ b/src/conf_mode/dhcpv6_relay.py
@@ -82,19 +82,20 @@ def generate(relay):
     if not relay:
         return None
 
-    render(config_file, 'dhcp-relay/dhcrelay6.conf.tmpl', relay)
+    render(config_file, 'dhcp-relay/dhcrelay6.conf.j2', relay)
     return None
 
 def apply(relay):
     # bail out early - looks like removal from running config
+    service_name = 'isc-dhcp-relay6.service'
     if not relay:
         # DHCPv6 relay support is removed in the commit
-        call('systemctl stop isc-dhcp-relay6.service')
+        call(f'systemctl stop {service_name}')
         if os.path.exists(config_file):
             os.unlink(config_file)
         return None
 
-    call('systemctl restart isc-dhcp-relay6.service')
+    call(f'systemctl restart {service_name}')
 
     return None