Role service-radvd: optimize ipaddr filters

This commit is contained in:
Tobias Hachmer 2017-10-03 21:18:39 +02:00
parent ef6bedfee5
commit a1705da9a0

View file

@ -1,3 +1,4 @@
# #
# {{ ansible_managed }} # {{ ansible_managed }}
# #
@ -12,7 +13,7 @@ interface {{ mesh_id }}BR
{% for ip_type, ip_list in mesh_value.ipv6.iteritems() %} {% for ip_type, ip_list in mesh_value.ipv6.iteritems() %}
{% for prefix in ip_list %} {% for prefix in ip_list %}
{% if ip_type == "ula" %} {% if ip_type == "ula" %}
RDNSS {{ prefix | ipaddr('net') | ipsubnet(64, 0) | ipaddr(magic) }} RDNSS {{ prefix | ipaddr('net') | ipsubnet(64, 0) | ipaddr(magic) | ipaddr('address') }}
{ {
FlushRDNSS off; FlushRDNSS off;
}; };
@ -23,9 +24,9 @@ interface {{ mesh_id }}BR
{% for ip_type, ip_list in mesh_value.ipv6.iteritems() %} {% for ip_type, ip_list in mesh_value.ipv6.iteritems() %}
{% for prefix in ip_list %} {% for prefix in ip_list %}
{% if ip_type == "public" %} {% if ip_type == "public" %}
prefix {{ prefix | ipaddr('net') | ipsubnet(64, magic) }} prefix {{ prefix | ipaddr('net') | ipsubnet(64, magic) | ipaddr('subnet') }}
{% else %} {% else %}
prefix {{ prefix | ipaddr('net') | ipsubnet(64, 0) }} prefix {{ prefix | ipaddr('net') | ipsubnet(64, 0) | ipaddr('subnet') }}
{% endif %} {% endif %}
{ {
AdvValidLifetime 864000; AdvValidLifetime 864000;