summaryrefslogtreecommitdiff
path: root/data/templates/frr/daemons.frr.tmpl
diff options
context:
space:
mode:
authorzsdc <taras@vyos.io>2021-12-29 17:57:38 +0200
committerzsdc <taras@vyos.io>2022-02-07 09:52:37 +0200
commit373132a899cd53eaebedd23bd44702d245ce8165 (patch)
tree3e1b6386480d118df486f7bb8d1bdf104c4ed623 /data/templates/frr/daemons.frr.tmpl
parent1af618103f288d83c51dee3d20e49f06e02b1ac7 (diff)
downloadvyos-1x-373132a899cd53eaebedd23bd44702d245ce8165.tar.gz
vyos-1x-373132a899cd53eaebedd23bd44702d245ce8165.zip
FRR: T4020: Updated CLI options processing for FRR daemons
- Reverted changes from `python/vyos/util.py`. This may lead to unnecessary FRR restart during each boot, depending on a default file content and template, but makes this changeset cleaner. - Fixed typos in node names (extra `>` characters). - Added SNMP module for `isisd` and `ldpd`, since they have it compiled now.
Diffstat (limited to 'data/templates/frr/daemons.frr.tmpl')
-rw-r--r--data/templates/frr/daemons.frr.tmpl8
1 files changed, 6 insertions, 2 deletions
diff --git a/data/templates/frr/daemons.frr.tmpl b/data/templates/frr/daemons.frr.tmpl
index 089cdae3b..ab7b14d6b 100644
--- a/data/templates/frr/daemons.frr.tmpl
+++ b/data/templates/frr/daemons.frr.tmpl
@@ -34,9 +34,13 @@ ripd_options=" --daemon -A 127.0.0.1
{%- if snmp is defined and snmp.ripd is defined %} -M snmp{% endif -%}
"
ripngd_options=" --daemon -A ::1"
-isisd_options=" --daemon -A 127.0.0.1"
+isisd_options=" --daemon -A 127.0.0.1
+{%- if snmp is defined and snmp.isisd is defined %} -M snmp{% endif -%}
+"
pimd_options=" --daemon -A 127.0.0.1"
-ldpd_options=" --daemon -A 127.0.0.1"
+ldpd_options=" --daemon -A 127.0.0.1
+{%- if snmp is defined and snmp.ldpd is defined %} -M snmp{% endif -%}
+"
nhrpd_options=" --daemon -A 127.0.0.1"
eigrpd_options=" --daemon -A 127.0.0.1"
babeld_options=" --daemon -A 127.0.0.1"