diff options
author | Christian Poessinger <christian@poessinger.com> | 2022-10-11 19:33:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-11 19:33:52 +0200 |
commit | 7f7705da4defc059fcb7d93692e8c87cb64cc68d (patch) | |
tree | 9e70bbcb6f3a348ffe8496446b4454c7afcf8d86 /data/templates/frr | |
parent | 25b7d6a5a4e06ab99134ab13fc4861f431ffe2a0 (diff) | |
parent | 08c2a057917c357ccf6fac7b51e05d5dae780fc3 (diff) | |
download | vyos-1x-7f7705da4defc059fcb7d93692e8c87cb64cc68d.tar.gz vyos-1x-7f7705da4defc059fcb7d93692e8c87cb64cc68d.zip |
Merge pull request #1574 from Cheeze-It/current
isis: T4739: ISIS segment routing being refactored
Diffstat (limited to 'data/templates/frr')
-rw-r--r-- | data/templates/frr/isisd.frr.j2 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/data/templates/frr/isisd.frr.j2 b/data/templates/frr/isisd.frr.j2 index e0f3b393e..194dbcb07 100644 --- a/data/templates/frr/isisd.frr.j2 +++ b/data/templates/frr/isisd.frr.j2 @@ -107,9 +107,6 @@ router isis VyOS {{ 'vrf ' + vrf if vrf is vyos_defined }} mpls-te inter-as{{ level }} {% endif %} {% if segment_routing is vyos_defined %} -{% if segment_routing.enable is vyos_defined %} - segment-routing on -{% endif %} {% if segment_routing.maximum_label_depth is vyos_defined %} segment-routing node-msd {{ segment_routing.maximum_label_depth }} {% endif %} @@ -144,6 +141,7 @@ router isis VyOS {{ 'vrf ' + vrf if vrf is vyos_defined }} {% endif %} {% endfor %} {% endif %} + segment-routing on {% endif %} {% if spf_delay_ietf.init_delay is vyos_defined %} spf-delay-ietf init-delay {{ spf_delay_ietf.init_delay }} short-delay {{ spf_delay_ietf.short_delay }} long-delay {{ spf_delay_ietf.long_delay }} holddown {{ spf_delay_ietf.holddown }} time-to-learn {{ spf_delay_ietf.time_to_learn }} |