ansible-roles/ansible-dhcpd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added support of multiple MACs for host statements

Browse Source 
Fixed primary declaration in failover statements.
Small bugfix in group expanding macros.
This commit is contained in:
RedRampage 2015-06-24 15:35:31 +03:00
parent 0de6ec18f7
commit 4039457bd6
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
templates/etc/dhcp/macros.j2
View File

@ -47,16 +47,16 @@ group {
{% endif %} {% endif %}
{% if group.groups is defined and group.groups %} {% if group.groups is defined and group.groups %}
{% for group in group.groups %} {% for group in group.groups %}
{{ print.group(group) | indent(8, true) }} {{ group(group) | indent(8, true) }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% if group.subnets is defined and group.subnets %} {% if group.subnets is defined and group.subnets %}
{% for subnet in group.subnets %} {% for subnet in group.subnets %}
{{ print.subnet(subnet) | indent(8, true) }} {{ subnet(subnet) | indent(8, true) }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% if group.hosts is defined and group.hosts %} {% if group.hosts is defined and group.hosts %}
{{ print.hosts(group.hosts) | indent(8, true) }} {{ hosts(group.hosts) | indent(8, true) }}
{% endif %} {% endif %}
} }
{% endmacro %} {% endmacro %}
@ -113,7 +113,7 @@ subnet {{ subnet.subnet | ipaddr('cidr') | ipaddr('address') }} netmask 255.255.
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% if subnet.hosts is defined and subnet.hosts %} {% if subnet.hosts is defined and subnet.hosts %}
{{ print.hosts(subnet.hosts) | indent(8, true) }} {{ hosts(subnet.hosts) | indent(8, true) }}
{% endif %} {% endif %}
} }
{% endmacro %} {% endmacro %}
@ -129,6 +129,23 @@ include "{{ hosts }}";
{% if host.comment is defined and host.comment %} {% if host.comment is defined and host.comment %}
# {{ host.comment }} # {{ host.comment }}
{% endif %} {% endif %}
{# Hack to support host with multiple MACs #}
{% if host.ethernet is defined and host.ethernet is sequence and not host.ethernet is string %}
{% for hwaddr in host.ethernet %}
host {{ host.hostname }}-hw{{ loop.index }} {
{% if host.options is defined and host.options %}
{{ host.options | indent(8,true) }}
{% endif %}
hardware ethernet {{ hwaddr }};
{% if not host.options is defined or (host.options and not 'host-name' in host.options) %}
option host-name = {{ host.hostname }};
{% endif %}
{% if host.address is defined and host.address %}
fixed-address {{ host.address }};
{% endif %}
}
{% endfor %}
{% else %}
host {{ host.hostname }} { host {{ host.hostname }} {
{% if host.options is defined and host.options %} {% if host.options is defined and host.options %}
{{ host.options | indent(8,true) }} {{ host.options | indent(8,true) }}
@ -144,6 +161,7 @@ host {{ host.hostname }} {
{% endif %} {% endif %}
{% endif %} {% endif %}
} }
{% endif %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endmacro %} {% endmacro %}
@ -156,7 +174,7 @@ host {{ host.hostname }} {
# {{ failover.comment }} # {{ failover.comment }}
{% endif %} {% endif %}
failover peer "{{ failover.failover }}" { failover peer "{{ failover.failover }}" {
{% if failover.primary is defined and failover.primary == inventory_hostname %} {% if failover.primary is defined and failover.primary in ansible_all_ipv4_addresses %}
primary; primary;
mclt {{ failover.mclt|default(3600) }}; mclt {{ failover.mclt|default(3600) }};
{% if failover.primary_fo_addr is defined and failover.primary_fo_addr %} {% if failover.primary_fo_addr is defined and failover.primary_fo_addr %}