diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-11-13 21:36:31 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2023-11-13 22:19:32 +0100 |
| commit | dd13213ae94f071bc30cc17f5fabef02fbf95939 (patch) | |
| tree | a67a9cab6456b9ced10c3fe84327913e10cc9b41 /data/templates | |
| parent | bc83fb097719f5c4c803808572f690fbc367b9e5 (diff) | |
| download | vyos-1x-dd13213ae94f071bc30cc17f5fabef02fbf95939.tar.gz vyos-1x-dd13213ae94f071bc30cc17f5fabef02fbf95939.zip | |
pim: T5733: fix CLI level of global PIM commands
Diffstat (limited to 'data/templates')
| -rw-r--r-- | data/templates/frr/pimd.frr.j2 | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/data/templates/frr/pimd.frr.j2 b/data/templates/frr/pimd.frr.j2 index 97c5ff58b..b01fb5ec7 100644 --- a/data/templates/frr/pimd.frr.j2 +++ b/data/templates/frr/pimd.frr.j2 @@ -58,13 +58,13 @@ ip pim ecmp {{ 'rebalance' if ecmp.rebalance is vyos_defined }} ip pim join-prune-interval {{ join_prune_interval }} {% endif %} {% if keep_alive_timer is vyos_defined %} -ip pim rp keep-alive-timer {{ keep_alive_timer }} +ip pim keep-alive-timer {{ keep_alive_timer }} {% endif %} {% if packets is vyos_defined %} ip pim packets {{ packets }} {% endif %} -{% if register_accept_list is vyos_defined %} -ip pim register-accept-list {{ register_accept_list }} +{% if register_accept_list.prefix_list is vyos_defined %} +ip pim register-accept-list {{ register_accept_list.prefix_list }} {% endif %} {% if register_suppress_time is vyos_defined %} ip pim register-suppress-time {{ register_suppress_time }} @@ -76,14 +76,17 @@ ip pim rp {{ address }} {{ group }} {% endfor %} {% endfor %} {% endif %} -{% if send_v6_secondary is vyos_defined %} -ip pim send-v6-secondary +{% if rp.keep_alive_timer is vyos_defined %} +ip pim rp keep-alive-timer {{ rp.keep_alive_timer }} +{% endif %} +{% if no_v6_secondary is vyos_defined %} +no ip pim send-v6-secondary {% endif %} {% if spt_switchover.infinity_and_beyond is vyos_defined %} ip pim spt-switchover infinity-and-beyond {{ 'prefix-list ' ~ spt_switchover.infinity_and_beyond.prefix_list if spt_switchover.infinity_and_beyond.prefix_list is defined }} {% endif %} -{% if ssm is vyos_defined %} -ip pim ssm {{ ssm }} +{% if ssm.prefix_list is vyos_defined %} +ip pim ssm prefix-list {{ ssm.prefix_list }} {% endif %} ! {% if igmp.watermark_warning is vyos_defined %} |