freifunk/puppet-ff_gw
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

new templates for bird6.conf

Browse source
This commit is contained in:
Martin Schütte 2014-05-19 22:17:18 +02:00
parent fa0974df7c
commit d1b1ddb5c1
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
manifests/init.pp
View file

@ -35,6 +35,7 @@ class ff_gw($ff_net, $ff_mesh_net, $ff_as, $mesh_mac, $gw_ipv4, $gw_ipv6, $secre
own_ipv4 => $gw_ipv4, own_ipv4 => $gw_ipv4,
own_ipv6 => $gw_ipv6, own_ipv6 => $gw_ipv6,
gw_do_ic_peering => $gw_do_ic_peering, gw_do_ic_peering => $gw_do_ic_peering,
ic_vpn_ip6 => $ic_vpn_ip6,
} }
if $gw_do_ic_peering { if $gw_do_ic_peering {

22
templates/etc/bird/bird6.conf.erb
View file

@ -53,25 +53,16 @@ protocol pipe pipe_ffhh {
}; };
# template for internal routing # template for internal routing
template bgp bgp_ibgp { template bgp locals {
table ffhh; table ffhh;
local as 65112; local as 65112;
source address <%= @own_ipv6 %>; source address <%= @own_ipv6 %>;
import all; import all;
export where source = RTS_BGP; export where source = RTS_BGP;
gateway direct; direct;
next hop self; next hop self;
}; };
# icvpn template for hamburg03
template bgp bgp_icvpn {
local as 65112;
source address <%= @own_ipv6 %>;
table ffhh;
import where is_ula();
export where is_self() || (source = RTS_BGP);
};
<% @peerings_v6.each_pair do |key, hash| -%><% if hash["ip"] != @own_ipv6 -%> <% @peerings_v6.each_pair do |key, hash| -%><% if hash["ip"] != @own_ipv6 -%>
protocol bgp <%= key %> from <%= hash["template"] %> { protocol bgp <%= key %> from <%= hash["template"] %> {
neighbor <%= hash["ip"] %> as <%= hash["as"] %>; neighbor <%= hash["ip"] %> as <%= hash["as"] %>;
@ -79,6 +70,15 @@ protocol bgp <%= key %> from <%= hash["template"] %> {
<% end -%><% end -%> <% end -%><% end -%>
<% if @gw_do_ic_peering -%> <% if @gw_do_ic_peering -%>
# icvpn template for hamburg03
template bgp peers {
local as 65112;
source address <%= @ic_vpn_ip6 %>;
table ffhh;
import where is_ula();
export where is_self() || (source = RTS_BGP);
};
<% @ic_peerings_v6.each_pair do |key, hash| -%><% if hash["ip"] != @own_ipv6 -%> <% @ic_peerings_v6.each_pair do |key, hash| -%><% if hash["ip"] != @own_ipv6 -%>
protocol bgp <%= key %> from <%= hash["template"] %> { protocol bgp <%= key %> from <%= hash["template"] %> {
neighbor <%= hash["ip"] %> as <%= hash["as"] %>; neighbor <%= hash["ip"] %> as <%= hash["as"] %>;