From 279648eeb3000f251e36c7579ae644b4bbe56005 Mon Sep 17 00:00:00 2001 From: toby Date: Wed, 19 Dec 2018 23:53:35 +0100 Subject: [PATCH] adding frr-pythontools and grub-pc as dependencies --- debian/control | 2 +- files/frr.conf.wit | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 804f6e4..76e4f19 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Vcs-Git: https://git.wit.com/netops/wit-network-config Package: wit-network-config Architecture: all -Depends: firmware-bnx2x, systemd, sed, tcpdump, mtr-tiny, iproute2, ifupdown, ipmitool, iptables, lldpd, strongswan, strongswan-swanctl, strongswan-pki, libstrongswan-extra-plugins, telnet, netcat, fping, curl, wget, ifstat, rsyslog, ncurses-term, net-tools, bridge-utils, vlan, gnupg, sudo, isc-dhcp-client, bind9-host, dnsutils, frr (>= 6.0-wit), frr (<< 6.1-wit) +Depends: firmware-bnx2x, systemd, sed, tcpdump, mtr-tiny, iproute2, ifupdown, ipmitool, iptables, lldpd, strongswan, strongswan-swanctl, strongswan-pki, libstrongswan-extra-plugins, telnet, netcat, fping, curl, wget, ifstat, rsyslog, ncurses-term, net-tools, bridge-utils, vlan, gnupg, sudo, isc-dhcp-client, bind9-host, dnsutils, frr (>= 6.0-wit), frr (<< 6.1-wit), frr-pythontools, grub-pc Provides: ${diverted-files} Conflicts: ${diverted-files}, dhcpcd5 Description: configure network for a standard wit compute and/or data node diff --git a/files/frr.conf.wit b/files/frr.conf.wit index 6201216..fed548f 100644 --- a/files/frr.conf.wit +++ b/files/frr.conf.wit @@ -36,6 +36,10 @@ router bgp NODEASN !!! neighbor eBGPv6 remote-as external !!! neighbor iBGP peer-group !!! neighbor iBGP remote-as internal + !!! neighbor CUSTOMERv4 peer-group + !!! neighbor CUSTOMERv4 remote-as external + !!! neighbor CUSTOMERv6 peer-group + !!! neighbor CUSTOMERv6 remote-as external !!! FRR_EDGE_NEIGH ! address-family ipv4 unicast @@ -61,6 +65,12 @@ router bgp NODEASN !!! neighbor iBGP next-hop-self !!! neighbor iBGP soft-reconfiguration inbound !!! neighbor iBGP allowas-in 1 + !!! neighbor CUSTOMERv4 activate + !!! neighbor CUSTOMERv4 next-hop-self + !!! neighbor CUSTOMERv4 remove-private-AS + !!! neighbor CUSTOMERv4 soft-reconfiguration inbound + !!! neighbor CUSTOMERv4 route-map CUSTOMERv4-IN in + !!! neighbor CUSTOMERv4 route-map eBGPv4-IN out !!! FRR_IPV4_EDGE_SUMMARIES_AGGREGATS exit-address-family ! @@ -86,6 +96,12 @@ router bgp NODEASN !!! neighbor iBGP next-hop-self !!! neighbor iBGP soft-reconfiguration inbound !!! neighbor iBGP allowas-in 1 + !!! neighbor CUSTOMERv6 activate + !!! neighbor CUSTOMERv6 next-hop-self + !!! neighbor CUSTOMERv6 remove-private-AS + !!! neighbor CUSTOMERv6 soft-reconfiguration inbound + !!! neighbor CUSTOMERv6 route-map CUSTOMERv6-IN in + !!! neighbor CUSTOMERv6 route-map eBGPv6-IN out !!! FRR_IPV6_EDGE_SUMMARIES_AGGREGATS exit-address-family ! @@ -103,6 +119,7 @@ router bgp NODEASN !!! FRR_IPV4_CUSTOMERS_PFLIST +!!! FRR_IPV4_PEERCUSTOMERS_PFLIST ip prefix-list DEFAULT seq 5 permit 0.0.0.0/0 ip prefix-list ALL seq 5 permit 0.0.0.0/0 le 32 @@ -123,6 +140,8 @@ ip prefix-list rfc1918 seq 40 permit 100.64.0.0/10 le 32 !!! FRR_IPV6_CUSTOMERS_PFLIST +!!! FRR_IPV6_PEERCUSTOMERS_PFLIST + ipv6 prefix-list DEFAULT seq 5 permit ::/0 ipv6 prefix-list ALL seq 5 permit ::/0 le 128 !!! ipv6 prefix-list eBGPv6-RELAXED seq 5 deny 3ffe::/16 le 128 @@ -177,6 +196,9 @@ route-map LOCALNETSv6 permit 5 !!! description "match IP block owned by WIT" !!! match ip address prefix-list WITv4-SUMMARIES !!! ! +!!! route-map eBGPv4-OUT permit 10 +!!! match ip address prefix-list PEERv4-CUSTOMER + !!! route-map eBGPv6-IN permit 5 @@ -189,6 +211,19 @@ route-map LOCALNETSv6 permit 5 !!! description "match IP block owned by WIT" !!! match ipv6 address prefix-list WITv6-SUMMARIES !!! ! +!!! route-map eBGPv6-OUT permit 10 +!!! match ipv6 address prefix-list PEERv6-CUSTOMER + + +!!! route-map CUSTOMERv4-IN permit 5 +!!! description "match IP block expected from Customer" +!!! match ip address prefix-list PEERv4-CUSTOMER + + +!!! route-map CUSTOMERv6-IN permit 5 +!!! description "match IP block expected from Customer" +!!! match ipv6 address prefix-list PEERv6-CUSTOMER + !!! route-map FABRICv4-OUT permit 5