getting close.... only frr.conf is not behaving

This commit is contained in:
root 2018-07-27 18:28:18 +00:00
parent c467b30914
commit 214ea903fc
7 changed files with 9 additions and 10 deletions

2
debian/postinst.ex vendored
View File

@ -25,7 +25,7 @@ case "$1" in
echo "iface lo:0 inet static\n address 10.1.$TIER_ID.$NODE_ID/32" >> /etc/network/interfaces.d/lo
echo "iface lo:0 inet6 static\n address 2604:bbc0::$TIER_ID:$NODE_ID/128" >> /etc/network/interfaces.d/lo
sed -e "s/VTEPINDEX/$MYID/" -e "s/TIERID/$TIERID/" -e "s/TIERASN/$(printf "%03d" $TIERID)/" -e "s/VTEPASN/$(printf "%03d" $MYID)/" /usr/share/wit-hypervisor/frr.conf.tmpl >/etc/frr/frr.conf
#sed -i -e "s/VTEPINDEX/$MYID/" -e "s/TIERID/$TIERID/" -e "s/TIERASN/$(printf "%03d" $TIERID)/" -e "s/VTEPASN/$(printf "%03d" $MYID)/" /etc/frr/frr.conf
echo 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="'$MGMT_MAC'", ATTR{type}=="1", NAME="mgmt1"' >/etc/udev/rules.d/70-persistent-net.rules

5
debian/preinst.ex vendored
View File

@ -23,8 +23,8 @@ case "$1" in
MGMT_MAC=$(ip -br link show dev $(ip -4 -br addr | grep 10.0. | awk '{ print $1 }') | awk '{ print $3 }')
[ "$MGMT_ID" -ge 0 -a "$MGMT_ID" -lt 16 ] && export DOMAINNAME=.usw1.wit.com
[ "$MGMT_ID" -ge 16 -a "$MGMT_ID" -lt 32 ] && export DOMAINNAME=.usw2.wit.com
[ "$MGMT_ID" -ge 0 -a "$MGMT_ID" -lt 16 ] && export DOMAINNAME=usw1.wit.com
[ "$MGMT_ID" -ge 16 -a "$MGMT_ID" -lt 32 ] && export DOMAINNAME=usw2.wit.com
[ ${HOSTNAME:0:1} = h ] && export HOSTTYPE=hypervisor
@ -46,6 +46,7 @@ case "$1" in
exit 2
fi
export NODE_ASN="$(printf "%03d" $TIER_ID)$(printf "%03d" $NODE_ID)"
;;

1
debian/wit-hypervisor.displace vendored Normal file
View File

@ -0,0 +1 @@
/etc/frr/frr.conf.wit

View File

@ -1,4 +0,0 @@
/etc/systemd/network/*
/etc/frr/daemons
/etc/bash.bashrc
/etc/systemd/timesyncd.conf.wit

View File

@ -11,4 +11,4 @@ files/qemu-ifup-public etc/libvirt/hooks
files/qemu-ifup etc/libvirt/hooks
files/firewall etc/init.d
files/interfaces etc/network
files/frr.conf.tmpl usr/share/wit-hypervisor
files/frr.conf.wit /etc/frr

View File

@ -1,3 +1,4 @@
/etc/frr/daemons.wit sed -e 's/bgpd=no/bgpd=yes/' -e 's/zebra=no/zebra=yes/'
/etc/systemd/timesyncd.conf.wit sed -e 's/#NTP=.*/NTP=ipv6.ntp.ubuntu.com/g'
/etc/bash.bashrc.wit sed -e '/.*bashrc-witaddon.*/d' -e '$ s/$/\nsource \/etc\/bashrc-witaddon/'
/etc/frr/daemons.wit sed -e 's/bgpd=no/bgpd=yes/' -e 's/zebra=no/zebra=yes/'
/etc/frr/frr.conf.wit sed -e "s/VTEPINDEX/$NODE_ID/" -e "s/TIERID/$TIER_ID/" -e "s/NODEASN/$NODE_ASN/"

View File

@ -13,7 +13,7 @@ interface feth2
ipv6 nd ra-interval 10
no ipv6 nd suppress-ra
!
router bgp 4200TIERASNVTEPASN
router bgp 4200NODEASN
bgp router-id 10.1.TIERID.VTEPINDEX
no bgp default ipv4-unicast
coalesce-time 1000