Browse Source

Add name prefix for peer and mesh GRE tunnel

Markus Lindenberg 9 years ago
parent
commit
f2483fedc4

+ 2 - 2
roles/internal/ffdo.mesh-interfaces/templates/gre-tunnel.j2

@@ -1,8 +1,8 @@
 {% for host in groups['all'] %}
 {% if hostvars[host] is defined %}
 {% if hostvars[host]['inventory_hostname'] != inventory_hostname %}
-auto {{hostvars[host]['inventory_hostname_short']}}
-iface {{hostvars[host]['inventory_hostname_short']}} inet manual
+auto mesh-{{hostvars[host]['inventory_hostname_short']}}
+iface mesh-{{hostvars[host]['inventory_hostname_short']}} inet manual
     pre-up ip link add $IFACE type gretap local {{ansible_default_ipv4.address}} remote {{hostvars[host]['ansible_ssh_host']}} dev {{ansible_default_ipv4.alias}}
     pre-up ip link set up dev $IFACE
     up batctl if add $IFACE

+ 1 - 1
roles/internal/ffdo.mesh-interfaces/templates/mesh_interfaces.j2

@@ -37,4 +37,4 @@ iface bat0 inet6 static
     pre-up ip -6 rule add to {{mesh_ipv6|ipaddr('cidr')}} table 42
     post-down ip -6 rule del from {{mesh_ipv6|ipaddr('cidr')}} table 42
     post-down ip -6 rule del to {{mesh_ipv6|ipaddr('cidr')}} table 42
-    #pre-up ebtables -A FORWARD -p IPv6 -i $IFACE --ip6-proto ipv6-icmp --ip6-icmp-type router-advertisement -j DROP
+    #pre-up ebtables -A FORWARD -p IPv6 -i $IFACE --ip6-proto ipv6-icmp --ip6-icmp-type router-advertisement -j DROP