diff options
| author | Emil Renner Berthing <esmil@labitat.dk> | 2019-04-01 12:34:26 +0200 |
|---|---|---|
| committer | Emil Renner Berthing <esmil@labitat.dk> | 2019-04-01 13:07:23 +0200 |
| commit | af333f0ec23a9784756a8b0e53a9896d7f61525f (patch) | |
| tree | 41614be62a37439df8ed101a8d8e14af72a09ee6 /roles/space_server/templates | |
| parent | 88756850d1a5cb28b897bdcc9337fcb6977aad0b (diff) | |
| download | labitat-ansible-af333f0ec23a9784756a8b0e53a9896d7f61525f.tar.gz labitat-ansible-af333f0ec23a9784756a8b0e53a9896d7f61525f.tar.xz labitat-ansible-af333f0ec23a9784756a8b0e53a9896d7f61525f.zip | |
space_server: vars: rework local_hosts
..to get rid of the need for ipv4/ipv6 filters
and python-netaddr dependency.
Diffstat (limited to 'roles/space_server/templates')
| -rw-r--r-- | roles/space_server/templates/avahi-hosts.j2 | 20 | ||||
| -rw-r--r-- | roles/space_server/templates/dhcpd.conf.j2 | 4 | ||||
| -rw-r--r-- | roles/space_server/templates/s.zone.j2 | 10 |
3 files changed, 21 insertions, 13 deletions
diff --git a/roles/space_server/templates/avahi-hosts.j2 b/roles/space_server/templates/avahi-hosts.j2 index f87ad4b..1e371e6 100644 --- a/roles/space_server/templates/avahi-hosts.j2 +++ b/roles/space_server/templates/avahi-hosts.j2 @@ -1,14 +1,18 @@ {% for host in local_hosts %} {% if 'mdns' not in host or host.mdns %} -{% for ip in host.ips | ipv4 %} -{% if loop.index <= 1 %} +{% if 'ipv4' in host %} +{% for ip in host.ipv4 %} +{% if loop.index <= 1 %} {{ ip }} {{ host.name }}.local -{% endif %} -{% endfor %} -{% for ip in host.ips | ipv6 %} -{% if loop.index <= 1 %} +{% endif %} +{% endfor %} +{% endif %} +{% if 'ipv6' in host %} +{% for ip in host.ipv6 %} +{% if loop.index <= 1 %} {{ ip }} {{ host.name }}.local -{% endif %} -{% endfor %} +{% endif %} +{% endfor %} +{% endif %} {% endif %} {% endfor %} diff --git a/roles/space_server/templates/dhcpd.conf.j2 b/roles/space_server/templates/dhcpd.conf.j2 index e071a88..23e08da 100644 --- a/roles/space_server/templates/dhcpd.conf.j2 +++ b/roles/space_server/templates/dhcpd.conf.j2 @@ -105,14 +105,14 @@ subnet 10.42.3.0 netmask 255.255.255.0 { group { use-host-decl-names on; {% for host in local_hosts %} +{% if 'mac' in host and 'ipv4' in host %} -{% if 'mac' in host %} {% if 'description' in host %} # {{ host.description }} {% endif %} host {{ host.name }} { hardware ethernet {{ host.mac }}; - fixed-address {{ host.ips | first }}; + fixed-address {{ host.ipv4|join(', ') }}; {% if 'filename' in host %} filename "{{ host.filename }}"; {% endif %} diff --git a/roles/space_server/templates/s.zone.j2 b/roles/space_server/templates/s.zone.j2 index 6bf9718..a392f3d 100644 --- a/roles/space_server/templates/s.zone.j2 +++ b/roles/space_server/templates/s.zone.j2 @@ -9,13 +9,17 @@ labitrack.s. 600 IN AAAA 2a01:4262:1ab::cafe track.s. 600 IN A 185.38.175.70 track.s. 600 IN AAAA 2a01:4262:1ab::cafe {% for host in local_hosts %} +{% if 'ipv4' in host or 'ipv6' in host %} -{% if 'ips' in host and host.ips|length > 0 %} -{% for ip in host.ips|ipv4 %} +{% if 'ipv4' in host %} +{% for ip in host.ipv4 %} {{ host.name }}.s. 600 IN A {{ ip }} {% endfor %} -{% for ip in host.ips|ipv6 %} +{% endif %} +{% if 'ipv6' in host %} +{% for ip in host.ipv6 %} {{ host.name }}.s. 600 IN AAAA {{ ip }} {% endfor %} {% endif %} +{% endif %} {% endfor %} |