foo.sh/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dhcpd: Move host declarations to global section

Browse source 
No need to set host declarations in subnet or shared-network since
they are always global and it gives warning during startup:

WARNING: Host declarations are global.  They are not limited to the scope you declared them in.
This commit is contained in:
Timo Makinen 2025-06-13 13:50:03 +00:00
parent e409252eba
commit ea3c05c2b5
4 changed files with 24 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

14
roles/dhcpd/templates/dhcpd.conf.cam.j2
View file

@ -17,7 +17,6 @@ on commit {
} }
shared-network CAMNET { shared-network CAMNET {
subnet 172.20.26.0 netmask 255.255.255.0 { subnet 172.20.26.0 netmask 255.255.255.0 {
default-lease-time 86400; default-lease-time 86400;
max-lease-time 604800; max-lease-time 604800;
@ -28,13 +27,12 @@ shared-network CAMNET {
option domain-name-servers 172.20.26.1, 172.20.26.2, 172.20.26.3; option domain-name-servers 172.20.26.1, 172.20.26.2, 172.20.26.3;
use-host-decl-names on; use-host-decl-names on;
} }
}
{% for host in ldap_hosts.results %} {% for host in ldap_hosts.results %}
host {{ host['cn'] }} { host {{ host['cn'] }} {
option host-name "{{ host['cn'] }}"; option host-name "{{ host['cn'] }}";
hardware ethernet {{ host['macAddress'] }}; hardware ethernet {{ host['macAddress'] }};
fixed-address {{ host['ipHostNumber'] }}; fixed-address {{ host['ipHostNumber'] }};
}
{% endfor %}
} }
{% endfor %}

14
roles/dhcpd/templates/dhcpd.conf.j2
View file

@ -44,7 +44,6 @@ class "OpenBSD" {
} }
shared-network FOOSH { shared-network FOOSH {
subnet 172.20.20.0 netmask 255.255.252.0 { subnet 172.20.20.0 netmask 255.255.252.0 {
default-lease-time 86400; default-lease-time 86400;
max-lease-time 604800; max-lease-time 604800;
@ -56,6 +55,7 @@ shared-network FOOSH {
option domain-name-servers 172.20.20.10, 172.20.20.11, 172.20.20.12; option domain-name-servers 172.20.20.10, 172.20.20.11, 172.20.20.12;
use-host-decl-names on; use-host-decl-names on;
} }
}
{% for hostname in hostvars %} {% for hostname in hostvars %}
{% if hostvars[hostname]['network_interfaces'] is defined %} {% if hostvars[hostname]['network_interfaces'] is defined %}
@ -66,14 +66,12 @@ shared-network FOOSH {
{% else %} {% else %}
{% set ipaddr = '172.20.21.' + interface['mac'].split(':')[5] | int(base=16) | string %} {% set ipaddr = '172.20.21.' + interface['mac'].split(':')[5] | int(base=16) | string %}
{% endif %} {% endif %}
host {{ hostname }} { host {{ hostname }} {
option host-name "{{ hostname }}"; option host-name "{{ hostname }}";
hardware ethernet {{ interface['mac'] }}; hardware ethernet {{ interface['mac'] }};
fixed-address {{ ipaddr }}; fixed-address {{ ipaddr }};
} }
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
}

14
roles/dhcpd/templates/dhcpd.conf.oob.j2
View file

@ -17,7 +17,6 @@ on commit {
} }
shared-network OOBNET { shared-network OOBNET {
subnet 172.20.25.0 netmask 255.255.255.0 { subnet 172.20.25.0 netmask 255.255.255.0 {
default-lease-time 86400; default-lease-time 86400;
max-lease-time 604800; max-lease-time 604800;
@ -28,13 +27,12 @@ shared-network OOBNET {
option domain-name-servers 172.20.25.1, 172.20.25.2, 172.20.25.3; option domain-name-servers 172.20.25.1, 172.20.25.2, 172.20.25.3;
use-host-decl-names on; use-host-decl-names on;
} }
}
{% for host in ldap_hosts.results %} {% for host in ldap_hosts.results %}
host {{ host['cn'] }} { host {{ host['cn'] }} {
option host-name "{{ host['cn'] }}"; option host-name "{{ host['cn'] }}";
hardware ethernet {{ host['macAddress'] }}; hardware ethernet {{ host['macAddress'] }};
fixed-address {{ host['ipHostNumber'] }}; fixed-address {{ host['ipHostNumber'] }};
}
{% endfor %}
} }
{% endfor %}

14
roles/dhcpd/templates/dhcpd.conf.print.j2
View file

@ -17,7 +17,6 @@ on commit {
} }
shared-network PRINTNET { shared-network PRINTNET {
subnet 172.20.24.0 netmask 255.255.255.0 { subnet 172.20.24.0 netmask 255.255.255.0 {
default-lease-time 86400; default-lease-time 86400;
max-lease-time 604800; max-lease-time 604800;
@ -28,13 +27,12 @@ shared-network PRINTNET {
option domain-name-servers 172.20.24.1, 172.20.24.2, 172.20.24.3; option domain-name-servers 172.20.24.1, 172.20.24.2, 172.20.24.3;
use-host-decl-names on; use-host-decl-names on;
} }
}
{% for host in ldap_hosts.results %} {% for host in ldap_hosts.results %}
host {{ host['cn'] }} { host {{ host['cn'] }} {
option host-name "{{ host['cn'] }}"; option host-name "{{ host['cn'] }}";
hardware ethernet {{ host['macAddress'] }}; hardware ethernet {{ host['macAddress'] }};
fixed-address {{ host['ipHostNumber'] }}; fixed-address {{ host['ipHostNumber'] }};
}
{% endfor %}
} }
{% endfor %}