1 files changed, 13 insertions, 4 deletions
diff --git a/data/templates/frr/bgpd.frr.tmpl b/data/templates/frr/bgpd.frr.tmpl
index 5edd3f97d..aa297876b 100644
--- a/data/templates/frr/bgpd.frr.tmpl
+++ b/data/templates/frr/bgpd.frr.tmpl
@@ -65,6 +65,9 @@
 {%   if config.shutdown is defined %}
  neighbor {{ neighbor }} shutdown
 {%   endif %}
+{%   if config.solo is defined %}
+ neighbor {{ neighbor }} solo
+{%   endif %}
 {%   if config.strict_capability_match is defined %}
  neighbor {{ neighbor }} strict-capability-match
 {%   endif %}
@@ -173,6 +176,9 @@
 {%       if afi_config.maximum_prefix is defined and afi_config.maximum_prefix is not none %}
   neighbor {{ neighbor }} maximum-prefix {{ afi_config.maximum_prefix }}
 {%       endif %}
+{%       if afi_config.maximum_prefix_out is defined and afi_config.maximum_prefix_out is not none %}
+  neighbor {{ neighbor }} maximum-prefix-out {{ afi_config.maximum_prefix_out }}
+{%       endif %}
 {%       if afi_config.nexthop_self is defined %}
   neighbor {{ neighbor }} next-hop-self {{ 'force' if afi_config.nexthop_self.force is defined }}
 {%       endif %}
@@ -399,15 +405,18 @@ router bgp {{ local_as }} {{ 'vrf ' ~ vrf if vrf is defined and vrf is not none
  bgp always-compare-med
 {%   endif %}
 {%   if parameters.bestpath is defined and parameters.bestpath is not none %}
-{%     if parameters.bestpath.compare_routerid is defined %}
- bgp bestpath compare-routerid
-{%     endif %}
 {%     if parameters.bestpath.as_path is defined and parameters.bestpath.as_path is not none %}
 {%       for option in parameters.bestpath.as_path %}
 {# replace is required for multipath-relax option #}
  bgp bestpath as-path {{ option|replace('_', '-') }}
 {%       endfor %}
 {%     endif %}
+{%     if parameters.bestpath.bandwidth is defined and parameters.bestpath.bandwidth is not none %}
+ bgp bestpath bandwidth {{ parameters.bestpath.bandwidth }}
+{%     endif %}
+{%     if parameters.bestpath.compare_routerid is defined %}
+ bgp bestpath compare-routerid
+{%     endif %}
 {%     if parameters.bestpath.med is defined and parameters.bestpath.med is not none %}
  bgp bestpath med {{ 'confed' if parameters.bestpath.med.confed is defined }} {{ 'missing-as-worst' if parameters.bestpath.med.missing_as_worst is defined }}
 {%     endif %}
@@ -420,7 +429,7 @@ router bgp {{ local_as }} {{ 'vrf ' ~ vrf if vrf is defined and vrf is not none
  bgp confederation identifier {{ parameters.confederation.identifier }}
 {%     endif %}
 {%     if parameters.confederation.peers is defined and parameters.confederation.peers is not none %}
- bgp confederation peers {{ parameters.confederation.peers }}
+ bgp confederation peers {{ parameters.confederation.peers | join(' ') }}
 {%     endif %}
 {%   endif %}
 {%   if parameters.dampening is defined and parameters.dampening is defined and parameters.dampening.half_life is defined and parameters.dampening.half_life is not none %}