Add FFRL peering GRE tunnels

roles/gateway-peering/tasks/main.yml

@@ -6,7 +6,7 @@
     dest: "/etc/network/interfaces.d/{{item.file}}"
     src: "{{item.template}}"
   with_items:
-  - file: peering.cfg
+  - file: 30_peering.cfg
     template: peering_interfaces.j2
 
 # - name: Install bird.conf

roles/gateway-peering/templates/bird.conf.j2

@@ -13,8 +13,8 @@ template bgp uplink {
 {% if peers is defined %}
 {% for peer in peers %}
 protocol bgp {{peer.name}} from uplink {
-        source address {{peer.source_ip4}};
-        neighbor {{peer.peer_ip4}} as {{peer.as}};
+        source address {{peer.source_ipv4}};
+        neighbor {{peer.peer_ipv4}} as {{peer.as}};
         default bgp_med 2;
 };
 

roles/gateway-peering/templates/bird6.conf.j2

@@ -14,7 +14,7 @@ template bgp uplink {
 {% if peers is defined %}
 {% for peer in peers %}
 protocol bgp {{peer.name}} from uplink {
-        neighbor {{peer.peer_ip6}} as {{peer.as}};
+        neighbor {{peer.peer_ipv6}} as {{peer.as}};
         default bgp_med 2;
 }
 

roles/gateway-peering/templates/peering_interfaces.j2

@@ -4,15 +4,16 @@
 auto peer-{{peer.name}}
 iface peer-{{peer.name}} inet tunnel
     mode gre
-    address {{peer.source_ip4}}
-    dstaddr {{peer.peer_ip4}}
-    local {{primary_v4_address}}
-    endpoint {{peer.gre_endpoint}}
     ttl 64
     mtu 1400
+    netmask 255.255.255.255
+    address {{peer.source_ipv4}}
+    dstaddr {{peer.peer_ipv4}}
+    local {{primary_v4_address}}
+    endpoint {{peer.gre_endpoint}}
 
 iface peer-{{peer.name}} inet6 static
-    address {{peer.gre.ip6}}
+    address {{peer.source_ipv6}}
 
 {% endif %}
 {% endfor %}

roles/mesh-interfaces/tasks/address.yml

@@ -2,5 +2,5 @@
 
 - name: Install mesh IP address dummy interface
   template:
-    dest: "/etc/network/interfaces.d/10_mesh_address.cfg"
+    dest: "/etc/network/interfaces.d/10_mesh-address.cfg"
     src: "mesh-address.cfg.j2"

site.yml

@@ -14,7 +14,7 @@
 
 - hosts: supernodes
   roles:
-#     - gateway-peering
+    - gateway-peering
 #     - gateway-nat
     - mesh-batman
     - mesh-vpn-fastd