more work on edge / dynamic frr config... .making progress but still ways to go,... just taking a backup...

This commit is contained in:
toby 2018-10-19 17:03:43 +02:00
parent 7e1d7993fe
commit 587bba4290
2 changed files with 6 additions and 9 deletions

View File

@ -85,7 +85,6 @@ case "$1" in
# gathering defined interfaces
FRR_IFS="!"
for if in mgmt feth up ibgp gre; do
for i in {1..2}; do #### for now we support/cound only to 2 interfaces of each type, we can just raise this to whatever number we want (exeption mgmt)
ifname=${if}${i}
@ -97,10 +96,10 @@ case "$1" in
remote=$(dig_txt remote.${ifname}.${HOSTNAME})
## build FRR interface config to enable ND adv for ipv6 unmanaged
FRR_IFS="$FRR_IFS\ninterface $ifname"
FRR_IFS="$FRR_IFS\n description $ifalias"
FRR_IFS="$FRR_IFS\n ipv6 nd ra-interval 10"
FRR_IFS="$FRR_IFS\n no ipv6 nd suppress-ra\n!"
FRR_IFS="${FRR_IFS}interface $ifname\n"
FRR_IFS="${FRR_IFS} description $ifalias\n"
FRR_IFS="${FRR_IFS} ipv6 nd ra-interval 10\n"
FRR_IFS="${FRR_IFS} no ipv6 nd suppress-ra\n!\n"
## build FRR neightbor interfaces
@ -140,8 +139,6 @@ case "$1" in
[ -z $peerv4 ] || FRR_EDGE_NEIGH=" !!! neighbor $peerv4 peer-group eBGPv4\n$FRR_EDGE_NEIGH"
[ -z $peerv6 ] || FRR_EDGE_NEIGH=" !!! neighbor $peerv6 peer-group eBGPv6\n$FRR_EDGE_NEIGH"
# we have a edge box, uncomment all edge special frr configs
SEDEXTRA='-e s/!!!\s\s//'
cat <<-EOF >>$IFCONFIG
auto $ifname
@ -276,8 +273,8 @@ case "$1" in
-e "s/^!!! FRR_IPV6_LOOPBACK_PFLIST/$FRR_IPV6_LOOPBACK_PFLIST/" \
-e "s/FRRROUTERID/${LOOPBACKv4}/" \
-e "s/NODEASN/${NODEASN}/" \
$SEDEXTRA \
$FRRCONFIG
[ -z $FRR_EDGE_NEIGH ] || sed -i -e 's/!!! //' $FRRCONFIG
exit 2
chown frr.frr $FRRCONFIG /etc/frr/daemons.wit

View File

@ -36,7 +36,7 @@ router bgp NODEASN
!!! neighbor eBGPv6 remote-as external
!!! neighbor iBGP peer-group
!!! neighbor iBGP remote-as internal
!!! FRR_NEIGH
!!! FRR_EDGE_NEIGH
!
address-family ipv4 unicast
redistribute kernel route-map EIPv4