X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f0058f868ee2e8c30f17c313b6e0b1e9d4054a42..853ea2eadefa5cec16758d7441e370419bec18c4:/cookbooks/dhcpd/templates/default/dhcpd.conf.erb diff --git a/cookbooks/dhcpd/templates/default/dhcpd.conf.erb b/cookbooks/dhcpd/templates/default/dhcpd.conf.erb index 305c63a8d..50ffd62d5 100644 --- a/cookbooks/dhcpd/templates/default/dhcpd.conf.erb +++ b/cookbooks/dhcpd/templates/default/dhcpd.conf.erb @@ -7,22 +7,21 @@ option TCode code 101 = text; default-lease-time 600; max-lease-time 7200; -<% node.interfaces(:role => :internal).each do |interface| -%> +<% node.ipaddresses(:role => :internal, :family => :inet).each do |address| -%> -subnet <%= interface[:network] %> netmask <%= interface[:netmask] %> { +subnet <%= address.network %> netmask <%= address.netmask %> { authoritative; range dynamic-bootp <%= node[:dhcpd][:first_address] %> <%= node[:dhcpd][:last_address] %>; - # option broadcast-address <%= interface[:broadcast] %>; - option routers <%= interface[:gateway] %>; + option routers <%= address.gateway %>; option domain-name "<%= @domain %>"; - option domain-name-servers <%= interface[:gateway] %>; + option domain-name-servers <%= address.gateway %>; option ntp-servers <%= node[:ntp][:servers].join(", ") %>; option time-offset 0; option PCode "UTC0"; option TCode "Etc/UTC"; - next-server <%= interface[:gateway] %>; + next-server <%= address.gateway %>; # See https://netboot.xyz/docs/docker/#dhcp-configurations if exists user-class and ( option user-class = "iPXE" ) { @@ -110,12 +109,6 @@ host eddie.oob.openstreetmap.org { fixed-address eddie.oob.openstreetmap.org; } -host eustace.oob.openstreetmap.org { - hardware ethernet 1c:c1:de:71:4d:2e; - server-name "eustace.oob.openstreetmap.org"; - fixed-address eustace.oob.openstreetmap.org; -} - host faffy.oob.openstreetmap.org { hardware ethernet 98:f2:b3:21:f6:e2; server-name "faffy.oob.openstreetmap.org";