BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/392716 )
Change subject: bird config 1.4 compat
......................................................................
bird config 1.4 compat
Change-Id: I003fbea2bb0823cb406df42dea7a64e05201566c
---
M modules/bird/templates/bird_anycast.conf.erb
1 file changed, 13 insertions(+), 17 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/bird/templates/bird_anycast.conf.erb
b/modules/bird/templates/bird_anycast.conf.erb
index 7f6f60c..dc2693d 100644
--- a/modules/bird/templates/bird_anycast.conf.erb
+++ b/modules/bird/templates/bird_anycast.conf.erb
@@ -5,12 +5,11 @@
}
protocol kernel {
- metric 64;
- import none;
+ import none;
}
protocol direct {
- interface "*";
+ interface "*";
}
filter vips_filter{
@@ -26,22 +25,19 @@
protocol bfd {
interface "*" {
interval 300 ms;
- multiplier 3;
- };
+ multiplier 3;
+ };
}
<%- end -%>
-
+<%- @neighbors.each do |neighbor| -%>
protocol bgp {
- import none;
- export filter vips_filter;
- local as 64605;
- check link yes;
- <% @neighbors.each do |neighbor| %>
- neighbor <%= @neighbor %> as 14907;
- <% end %>
- <%- if @bfd -%>
- bfd yes;
- <%- end -%>
-
+ import none;
+ export filter vips_filter;
+ local as 64605;
+ neighbor <%= neighbor %> as 14907;
+ <%- if @bfd -%>
+ bfd yes;
+ <%- end -%>
}
+<%- end -%>
--
To view, visit https://gerrit.wikimedia.org/r/392716
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I003fbea2bb0823cb406df42dea7a64e05201566c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
