WIP: Infrastructure routers #91

Draft
jeltz wants to merge 15 commits from infra_router into master
2 changed files with 4 additions and 4 deletions
Showing only changes of commit 8883e672bd - Show all commits

View file

@ -76,7 +76,7 @@
keepalived_notify_fault: "/usr/local/sbin/conntrackd_vrrp fault" keepalived_notify_fault: "/usr/local/sbin/conntrackd_vrrp fault"
keepalived_virtual_router_id: 42 keepalived_virtual_router_id: 42
keepalived_interface: vlan129 keepalived_interface: vlan129
keepalived_virtual_addresses_v4: keepalived_virtual_ipv4_addrs:
vlan111: vlan111:
- 45.66.111.10/24 # 45.66.111.1/24 - 45.66.111.10/24 # 45.66.111.1/24
vlan128: vlan128:
@ -89,7 +89,7 @@
- 10.133.0.1/16 - 10.133.0.1/16
vlan134: vlan134:
- 10.134.0.1/16 - 10.134.0.1/16
keepalived_virtual_addresses_v6: keepalived_virtual_ipv6_addrs:
vlan111: vlan111:
- fe80::200:02ff:fe23:ae26/64 - fe80::200:02ff:fe23:ae26/64
- 2a09:6840:111:0:10::/56 # 2a09:6840:111:0:1::/56 - 2a09:6840:111:0:10::/56 # 2a09:6840:111:0:1::/56

View file

@ -32,7 +32,7 @@ vrrp_instance instance_v4 {
advert_int 1 advert_int 1
accept accept
virtual_ipaddress { virtual_ipaddress {
{% for dev, addrs in keepalived_virtual_addresses_v4.items() %} {% for dev, addrs in keepalived_virtual_ipv4_addrs.items() %}
{% for addr in addrs %} {% for addr in addrs %}
{{ addr }} dev {{ dev }} {{ addr }} dev {{ dev }}
{% endfor %} {% endfor %}
@ -49,7 +49,7 @@ vrrp_instance instance_v6 {
advert_int 1 advert_int 1
accept accept
virtual_ipaddress { virtual_ipaddress {
{% for dev, addrs in keepalived_virtual_addresses_v6.items() %} {% for dev, addrs in keepalived_virtual_ipv6_addrs.items() %}
{% for addr in addrs %} {% for addr in addrs %}
{{ addr }} dev {{ dev }} {{ addr }} dev {{ dev }}
{% endfor %} {% endfor %}