Browse Source

bgp: Switch Grenode session from transit to peering

  * Grenode is now a « private peering »
    * Announce only gitoyen's routes to grenode
  * Switch grenode from community 40000 to 30000
  * Rename sessions (member peering)
Sebastien Badia 9 years ago
parent
commit
8199f88f88

+ 13 - 19
etc/local/bird/bird/bgp.conf

@@ -25,7 +25,6 @@ protocol bgp core_zoulou from ibgp {
 	neighbor 80.67.168.1 as 20766;
 }
 
-
 #
 # Member: FDN
 #
@@ -43,22 +42,6 @@ protocol bgp membre_fdn2 from tpl_fdn {
 	neighbor 80.67.168.214 as 65055;
 }
 
-
-#
-# Member: Grenode
-#
-template bgp tpl_grenode {
-	local as 20766;
-	description "Livraison Grenode";
-	import where bgp_import(51083,"member",40000);
-        export where bgp_export(51083,"full");
-}
-
-protocol bgp member_grenode1 from tpl_grenode {
-	neighbor 80.67.168.222 as 51083;
-}
-
-
 #
 # Member: Lautrenet
 #
@@ -76,7 +59,6 @@ protocol bgp membre_lautrenet2 from tpl_lautrenet {
 	neighbor 80.67.168.206 as 64600;
 }
 
-
 #
 # Member: Tetaneutral
 #
@@ -105,7 +87,6 @@ protocol bgp member_neutrinet from tpl_neutrinet {
 	neighbor 80.67.168.237 as 204059;
 }
 
-
 #
 # Transit: Absolight
 #
@@ -121,6 +102,19 @@ protocol bgp transit_absolight from tpl_absolight {
 	description "Transit Absolight";
 }
 
+#
+# Peering: Grenode
+#
+template bgp tpl_grenode {
+	local as 20766;
+	description "Peering Grenode";
+	import where bgp_import(51083,"peering",30000);
+        export where bgp_export(51083,"members");
+}
+
+protocol bgp peering_grenode1 from tpl_grenode {
+	neighbor 80.67.168.222 as 51083;
+}
 
 #
 # Peering : FranceIX

+ 3 - 6
etc/local/bird/bird/filters.conf

@@ -14,15 +14,12 @@ prefix set as_prefixes;
     case AS {
         # Grenode
         51083:  as_prefixes = [
-                        91.216.110.0/24+,       # Grenode
-                        193.33.56.0/23+,        # Rezine
-                        80.67.183.0/24+,        # Rezine wifi 1
-                        89.234.140.0/24+,       # Illyse
-                        80.67.180.0/24+         # Ilico
+                        80.67.183.0/24+,        # PA Rezine wifi 1
+                        80.67.180.0/24+         # PA Ilico
         ];
         # Tetaneutral
         197422: as_prefixes = [
-                        80.67.182.0/24+,         # Tetaneutral
+                        80.67.182.0/24+,         # PA Tetaneutral
                         89.234.156.0/23+,
                         91.224.148.0/23+,
                         185.119.168.0/22+

+ 13 - 17
etc/local/bird/bird6/bgp.conf

@@ -43,22 +43,6 @@ protocol bgp member_fdn2 from tpl_fdn {
 	neighbor 2001:910:0:800::214 as 65055;
 }
 
-
-#
-# Member: Grenode
-#
-template bgp tpl_grenode {
-	local as 20766;
-	description "Livraison Grenode";
-        import where bgp_import(51083,"member",40000);
-        export where bgp_export(51083,"full");
-}
-
-protocol bgp member_grenode1 from tpl_grenode {
-	neighbor 2001:910:0:116::222 as 51083;
-}
-
-
 #
 # Member: L'Autre.net
 #
@@ -123,11 +107,23 @@ protocol bgp transit_absolight from tpl_absolight {
 	description "Transit Absolight";
 }
 
+#
+# Peering: Grenode
+#
+template bgp tpl_grenode {
+	local as 20766;
+	description "Peering Grenode";
+        import where bgp_import(51083,"peering",30000);
+        export where bgp_export(51083,"members");
+}
+
+protocol bgp peering_grenode1 from tpl_grenode {
+	neighbor 2001:910:0:116::222 as 51083;
+}
 
 #
 # Peering: FranceIX
 #
-
 template bgp tpl_franceix_rs {
 	local as 20766;
         import where bgp_import(51706,"peering",26000);

+ 1 - 3
etc/local/bird/bird6/filters.conf

@@ -16,9 +16,7 @@ prefix set as_prefixes;
         51083:  as_prefixes = [
                         2001:912::/36+,         # Grenode
                         2001:912:1000::/36+,    # Rezine
-                        2001:912:2000::/36+,    # Ilico
-                        2a00:5881:4000::/40+,   # Illyse Lyon
-                        2a00:5881:c000::/40+    # Illyse St-Etienne
+                        2001:912:2000::/36+     # Ilico
         ];
         # Tetaneutral
         197422: as_prefixes = [