diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2020-07-15 17:07:11 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2020-07-20 23:06:59 +0200 |
| commit | 9f4db40ff68f45c611a84772bc79f58813ad3ef1 (patch) | |
| tree | 5d6d92df6fa43df0d3482cab0fb029cb3fcdd588 /roles/vm/host/network/templates/bridge-interfaces.j2 | |
| parent | Merge branch 'topic/installer-again' (diff) | |
network: allow multiple overlays per segment (WIP)
Diffstat (limited to 'roles/vm/host/network/templates/bridge-interfaces.j2')
| -rw-r--r-- | roles/vm/host/network/templates/bridge-interfaces.j2 | 13 |
1 files changed, 7 insertions, 6 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 %} |