diff --git a/roles/dhcpd/templates/dhcpd.conf.cam.j2 b/roles/dhcpd/templates/dhcpd.conf.cam.j2 index b8d3668..fa49359 100644 --- a/roles/dhcpd/templates/dhcpd.conf.cam.j2 +++ b/roles/dhcpd/templates/dhcpd.conf.cam.j2 @@ -16,17 +16,15 @@ on commit { ); } -shared-network CAMNET { - subnet 172.20.26.0 netmask 255.255.255.0 { - default-lease-time 86400; - max-lease-time 604800; - option subnet-mask 255.255.255.0; - option broadcast-address 172.20.26.255; +subnet 172.20.26.0 netmask 255.255.255.0 { + default-lease-time 86400; + max-lease-time 604800; + option subnet-mask 255.255.255.0; + option broadcast-address 172.20.26.255; - option domain-name "cam.foo.sh"; - option domain-name-servers 172.20.26.1, 172.20.26.2, 172.20.26.3; - use-host-decl-names on; - } + option domain-name "cam.foo.sh"; + option domain-name-servers 172.20.26.1, 172.20.26.2, 172.20.26.3; + use-host-decl-names on; } {% for host in ldap_hosts.results %} diff --git a/roles/dhcpd/templates/dhcpd.conf.j2 b/roles/dhcpd/templates/dhcpd.conf.j2 index 5ec89f0..e7e148c 100644 --- a/roles/dhcpd/templates/dhcpd.conf.j2 +++ b/roles/dhcpd/templates/dhcpd.conf.j2 @@ -43,18 +43,16 @@ class "OpenBSD" { filename "auto_install"; } -shared-network FOOSH { - subnet 172.20.20.0 netmask 255.255.252.0 { - default-lease-time 86400; - max-lease-time 604800; - option subnet-mask 255.255.252.0; - option broadcast-address 172.20.23.255; - option routers 172.20.20.1; +subnet 172.20.20.0 netmask 255.255.252.0 { + default-lease-time 86400; + max-lease-time 604800; + option subnet-mask 255.255.252.0; + option broadcast-address 172.20.23.255; + option routers 172.20.20.1; - option domain-name "home.foo.sh"; - option domain-name-servers 172.20.20.10, 172.20.20.11, 172.20.20.12; - use-host-decl-names on; - } + option domain-name "home.foo.sh"; + option domain-name-servers 172.20.20.10, 172.20.20.11, 172.20.20.12; + use-host-decl-names on; } {% for hostname in hostvars %} diff --git a/roles/dhcpd/templates/dhcpd.conf.oob.j2 b/roles/dhcpd/templates/dhcpd.conf.oob.j2 index b6e9a2e..6a0382a 100644 --- a/roles/dhcpd/templates/dhcpd.conf.oob.j2 +++ b/roles/dhcpd/templates/dhcpd.conf.oob.j2 @@ -16,17 +16,15 @@ on commit { ); } -shared-network OOBNET { - subnet 172.20.25.0 netmask 255.255.255.0 { - default-lease-time 86400; - max-lease-time 604800; - option subnet-mask 255.255.255.0; - option broadcast-address 172.20.25.255; +subnet 172.20.25.0 netmask 255.255.255.0 { + default-lease-time 86400; + max-lease-time 604800; + option subnet-mask 255.255.255.0; + option broadcast-address 172.20.25.255; - option domain-name "oob.foo.sh"; - option domain-name-servers 172.20.25.1, 172.20.25.2, 172.20.25.3; - use-host-decl-names on; - } + option domain-name "oob.foo.sh"; + option domain-name-servers 172.20.25.1, 172.20.25.2, 172.20.25.3; + use-host-decl-names on; } {% for host in ldap_hosts.results %} diff --git a/roles/dhcpd/templates/dhcpd.conf.print.j2 b/roles/dhcpd/templates/dhcpd.conf.print.j2 index dee631d..1a4b772 100644 --- a/roles/dhcpd/templates/dhcpd.conf.print.j2 +++ b/roles/dhcpd/templates/dhcpd.conf.print.j2 @@ -16,17 +16,15 @@ on commit { ); } -shared-network PRINTNET { - subnet 172.20.24.0 netmask 255.255.255.0 { - default-lease-time 86400; - max-lease-time 604800; - option subnet-mask 255.255.255.0; - option broadcast-address 172.20.24.255; +subnet 172.20.24.0 netmask 255.255.255.0 { + default-lease-time 86400; + max-lease-time 604800; + option subnet-mask 255.255.255.0; + option broadcast-address 172.20.24.255; - option domain-name "print.foo.sh"; - option domain-name-servers 172.20.24.1, 172.20.24.2, 172.20.24.3; - use-host-decl-names on; - } + option domain-name "print.foo.sh"; + option domain-name-servers 172.20.24.1, 172.20.24.2, 172.20.24.3; + use-host-decl-names on; } {% for host in ldap_hosts.results %}