diff options
Diffstat (limited to 'roles/vm')
-rw-r--r-- | roles/vm/host/network/templates/bridge-interfaces.j2 | 13 | ||||
-rw-r--r-- | roles/vm/host/network/templates/interfaces.j2 | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/roles/vm/host/network/templates/bridge-interfaces.j2 b/roles/vm/host/network/templates/bridge-interfaces.j2 index 05144430..c0519737 100644 --- a/roles/vm/host/network/templates/bridge-interfaces.j2 +++ b/roles/vm/host/network/templates/bridge-interfaces.j2 @@ -32,13 +32,14 @@ iface {{ bridge_name }} inet manual up echo 1 > /proc/sys/net/ipv4/conf/{{ ansible_default_ipv4.interface }}/forwarding up /sbin/iptables -t nat -A POSTROUTING -o {{ ansible_default_ipv4.interface }} -s {{ bridge.prefix }} -j SNAT --to {{ ansible_default_ipv4.address }} {% endif %} -{% if 'overlay' in bridge %} -{% for dest, offset in (bridge.overlay.offsets | dictsort(by='value')) %} - up /bin/ip route add {{ (bridge.overlay.prefix | ipaddr(offset)).split('/')[0] }}/32 via {{ (bridge.prefix | ipaddr(bridge.offsets[dest])).split('/')[0] }} # {{ dest }} +{% for overlay_name in (bridge.overlays | default({}) | list | sort) %} +{% set overlay = bridge.overlays[overlay_name] %} +{% for dest, offset in (overlay.offsets | dictsort(by='value')) %} + up /bin/ip route add {{ (overlay.prefix | ipaddr(offset)).split('/')[0] }}/32 via {{ (bridge.prefix | ipaddr(bridge.offsets[dest])).split('/')[0] }} # {{ dest }} {% endfor %} - up /bin/ip route add unreachable {{ bridge.overlay.prefix }} - down /sbin/ip route del {{ bridge.overlay.prefix }} -{% endif %} + up /bin/ip route add unreachable {{ overlay.prefix }} + down /sbin/ip route del {{ overlay.prefix }} +{% endfor %} {% if 'nat' in bridge and bridge.nat %} down /sbin/iptables -t nat -D POSTROUTING -o {{ ansible_default_ipv4.interface }} -s {{ bridge.prefix }} -j SNAT --to {{ ansible_default_ipv4.address }} {% endif %} diff --git a/roles/vm/host/network/templates/interfaces.j2 b/roles/vm/host/network/templates/interfaces.j2 index fe57a024..004c1f96 100644 --- a/roles/vm/host/network/templates/interfaces.j2 +++ b/roles/vm/host/network/templates/interfaces.j2 @@ -60,7 +60,7 @@ iface {{ interface.name }} inet6 static {% endfor %} -{% for parent in network.vlans | default({}) | list | sort %} +{% for parent in (network.vlans | default({}) | list | sort) %} ## vlan interfaces @ {{ parent }} {% for vlan in network.vlans[parent] %} |