diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-05-06 19:26:12 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-05-06 19:26:14 +0200 |
| commit | 144a2a9da0a7e5d30cb14227c2503f52793777da (patch) | |
| tree | fab74e29f6b92faae42119dd61f257c327e04cb8 /data/templates | |
| parent | 33cfc134a7139515fc8ea7a2a279f03a944defb4 (diff) | |
| download | vyos-1x-144a2a9da0a7e5d30cb14227c2503f52793777da.tar.gz vyos-1x-144a2a9da0a7e5d30cb14227c2503f52793777da.zip | |
bgp: T2850: when concatenating strings in Jinja2 use ~ over +
A + simply adds the value, but a ~ will convert the variable to a string
first.
Diffstat (limited to 'data/templates')
| -rw-r--r-- | data/templates/frr/bgp.frr.tmpl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/templates/frr/bgp.frr.tmpl b/data/templates/frr/bgp.frr.tmpl index 2f67fa39e..8090e154d 100644 --- a/data/templates/frr/bgp.frr.tmpl +++ b/data/templates/frr/bgp.frr.tmpl @@ -152,7 +152,7 @@ neighbor {{ neighbor }} capability orf prefix-list receive {% endif %} {% if afi_config.default_originate is defined %} - neighbor {{ neighbor }} default-originate {{ 'route-map ' + afi_config.default_originate.route_map if afi_config.default_originate.route_map is defined }} + neighbor {{ neighbor }} default-originate {{ 'route-map ' ~ afi_config.default_originate.route_map if afi_config.default_originate.route_map is defined }} {% endif %} {% if afi_config.distribute_list is defined and afi_config.distribute_list is not none %} {% if afi_config.distribute_list.export is defined and afi_config.distribute_list.export is not none %} @@ -214,7 +214,7 @@ {% endif %} {% endmacro %} ! -router bgp {{ local_as }} {{ 'vrf ' + vrf if vrf is defined and vrf is not none }} +router bgp {{ local_as }} {{ 'vrf ' ~ vrf if vrf is defined and vrf is not none }} {% if parameters is defined and parameters.ebgp_requires_policy is defined %} bgp ebgp-requires-policy {% else %} @@ -288,7 +288,7 @@ router bgp {{ local_as }} {{ 'vrf ' + vrf if vrf is defined and vrf is not none {% if afi_config.advertise is defined and afi_config.advertise is not none %} {% for adv_afi, adv_afi_config in afi_config.advertise.items() %} {% if adv_afi_config.unicast is defined and adv_afi_config.unicast is not none %} - advertise {{ adv_afi }} unicast {{ 'route-map ' + adv_afi_config.unicast.route_map if adv_afi_config.unicast.route_map is defined }} + advertise {{ adv_afi }} unicast {{ 'route-map ' ~ adv_afi_config.unicast.route_map if adv_afi_config.unicast.route_map is defined }} {% endif %} {% endfor %} {% endif %} @@ -445,7 +445,7 @@ router bgp {{ local_as }} {{ 'vrf ' + vrf if vrf is defined and vrf is not none {% endif %} {% endif %} {% if parameters.graceful_restart is defined %} - bgp graceful-restart {{ 'stalepath-time ' + parameters.graceful_restart.stalepath_time if parameters.graceful_restart.stalepath_time is defined }} + bgp graceful-restart {{ 'stalepath-time ' ~ parameters.graceful_restart.stalepath_time if parameters.graceful_restart.stalepath_time is defined }} {% endif %} {% if parameters.graceful_shutdown is defined %} bgp graceful-shutdown |