rc/servers
4
0
Fork 2
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Fix ipaddr call for new ansible

Browse source 
The ipaddr filter was moved to ansible.utils sometime after 2.18.
This commit is contained in:
Miha Frangež 2026-01-09 11:32:58 +01:00 • committed by Timotej Lazar
parent 8276c6e8b4
commit e93cdfd1dd
9 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
roles/dnsmasq/templates/10-ranges.conf.j2
View file

@ -1,18 +1,18 @@
{% for prefix in prefixes | selectattr('custom_fields.dhcp_server') | sort(attribute='vlan.name') %}
{% if prefix.custom_fields.dhcp_server.address | ipaddr('address') == primary_ip4 %}
{% if prefix.custom_fields.dhcp_server.address | ansible.utils.ipaddr('address') == primary_ip4 %}
# {{ prefix.vlan.name }}
{% for range in prefix.custom_fields.dhcp_ranges | default([], true) %}
dhcp-range = set:{{ prefix.vlan.name }},{{ range.start_address | ipaddr('address') }},{{ range.end_address | ipaddr('address') }},{{ prefix.prefix | ipaddr('netmask') }}
dhcp-range = set:{{ prefix.vlan.name }},{{ range.start_address | ansible.utils.ipaddr('address') }},{{ range.end_address | ansible.utils.ipaddr('address') }},{{ prefix.prefix | ansible.utils.ipaddr('netmask') }}
{% endfor %}
{% if prefix.custom_fields.gateway %}
dhcp-option = tag:{{ prefix.vlan.name }},option:router,{{ prefix.custom_fields.gateway.address | ipaddr('address') }}
dhcp-option = tag:{{ prefix.vlan.name }},option:router,{{ prefix.custom_fields.gateway.address | ansible.utils.ipaddr('address') }}
{% endif -%}
{% for host in hostvars.values() | selectattr('interfaces', 'defined') %}
{% for interface in host.interfaces | selectattr('mac_address') %}
{% for address in interface.ip_addresses
| selectattr('status.value', '==', 'dhcp')
| map(attribute='address') | map('ipaddr', 'address')
| map(attribute='address') | map('ansible.utils.ipaddr', 'address')
| select('ansible.utils.in_network', prefix.prefix) %}
dhcp-host = {{ interface.mac_address | lower }},{{ address }},{{ interface.device.name | lower }}
{% endfor %}
@ -24,5 +24,5 @@ dhcp-host = {{ interface.mac_address | lower }},{{ address }},{{ interface.devic
# custom reservations
{% for reservation in reservations | default([]) %}
dhcp-host = {{ reservation.mac | lower }},{{ reservation.ip | ipaddr('address') }},{{ reservation.host | lower }}
dhcp-host = {{ reservation.mac | lower }},{{ reservation.ip | ansible.utils.ipaddr('address') }},{{ reservation.host | lower }}
{% endfor %}