diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-02-20 19:35:24 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2022-02-20 19:35:24 +0100 |
| commit | 35e6871c4fdece73962902d10d835ccac0c7e364 (patch) | |
| tree | 34195dacaa1f592de8eaab96df73de0b9e4c1a67 /data | |
| parent | ac8ba16d63fb420ff6cd2f76e1666a329687a9a7 (diff) | |
| parent | 5d14a04b6ffbd592e8257d98d71da5acb1bb45a9 (diff) | |
| download | vyos-1x-35e6871c4fdece73962902d10d835ccac0c7e364.tar.gz vyos-1x-35e6871c4fdece73962902d10d835ccac0c7e364.zip | |
Merge branch 't4203-dhcp' into current
* t4203-dhcp:
smoketest: dhcp: T4203: move testcase to base class
static: T4203: obey interface dhcp default route distance
interface: T4203: prevent DHCP client restart if not necessary
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/frr/staticd.frr.tmpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/templates/frr/staticd.frr.tmpl b/data/templates/frr/staticd.frr.tmpl index bfe959c1d..5d833228a 100644 --- a/data/templates/frr/staticd.frr.tmpl +++ b/data/templates/frr/staticd.frr.tmpl @@ -17,10 +17,10 @@ vrf {{ vrf }} {% endif %} {# IPv4 default routes from DHCP interfaces #} {% if dhcp is defined and dhcp is not none %} -{% for interface in dhcp %} +{% for interface, interface_config in dhcp.items() %} {% set next_hop = interface | get_dhcp_router %} {% if next_hop is defined and next_hop is not none %} -{{ ip_prefix }} route 0.0.0.0/0 {{ next_hop }} {{ interface }} tag 210 210 +{{ ip_prefix }} route 0.0.0.0/0 {{ next_hop }} {{ interface }} tag 210 {{ interface_config.distance }} {% endif %} {% endfor %} {% endif %} |