summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-09-19 11:32:04 +0200
committerChristian Poessinger <christian@poessinger.com>2021-09-19 12:25:43 +0200
commita672c7c012b85cd2950403400900453aa318613b (patch)
treef4921964487e879eec993b52d9f6f856be3a44f2 /data
parent81dbce734c207a0fce836bf2a5d283910509f4ff (diff)
downloadvyos-1x-a672c7c012b85cd2950403400900453aa318613b.tar.gz
vyos-1x-a672c7c012b85cd2950403400900453aa318613b.zip
dhcp-server: T3672: re-add missing "name" CLI option
This option is mandatory and must be user configurable as it needs to match on both sides. (cherry picked from commit 2985035bcb2f3732e15a41e3c2ee6c6c93a6836e)
Diffstat (limited to 'data')
-rw-r--r--data/templates/dhcp-server/dhcpd.conf.tmpl5
1 files changed, 2 insertions, 3 deletions
diff --git a/data/templates/dhcp-server/dhcpd.conf.tmpl b/data/templates/dhcp-server/dhcpd.conf.tmpl
index 23917b303..9aeaafcc2 100644
--- a/data/templates/dhcp-server/dhcpd.conf.tmpl
+++ b/data/templates/dhcp-server/dhcpd.conf.tmpl
@@ -36,9 +36,8 @@ option wpad-url code 252 = text;
{% endif %}
{% if failover is defined and failover is not none %}
-{% set dhcp_failover_name = 'VyOS-DHCP-failover-peer' %}
# DHCP failover configuration
-failover peer "{{ dhcp_failover_name }}" {
+failover peer "{{ failover.name }}" {
{% if failover.status == 'primary' %}
primary;
mclt 1800;
@@ -177,7 +176,7 @@ shared-network {{ network | replace('_','-') }} {
{% endif %}
pool {
{% if subnet_config.enable_failover is defined %}
- failover peer "{{ dhcp_failover_name }}";
+ failover peer "{{ failover.name }}";
deny dynamic bootp clients;
{% endif %}
{% if subnet_config.range is defined and subnet_config.range is not none %}