diff --git a/roles/network/templates/dhcp/dhcpd-iiab.conf.j2 b/roles/network/templates/dhcp/dhcpd-iiab.conf.j2 index c6cdc6028..4b452a163 100644 --- a/roles/network/templates/dhcp/dhcpd-iiab.conf.j2 +++ b/roles/network/templates/dhcp/dhcpd-iiab.conf.j2 @@ -12,7 +12,7 @@ subnet 172.18.96.0 netmask 255.255.224.0 { {% if iiab_network_mode == "Gateway" %} option routers {{ lan_ip }}; {% endif %} - {% if 172_network %} + {% if network_172 %} option subnet-mask 255.255.224.0; option broadcast-address 172.18.127.255; {% else %} diff --git a/roles/network/templates/network/dnsmasq.conf.j2 b/roles/network/templates/network/dnsmasq.conf.j2 index 782f38049..056830267 100644 --- a/roles/network/templates/network/dnsmasq.conf.j2 +++ b/roles/network/templates/network/dnsmasq.conf.j2 @@ -18,7 +18,12 @@ addn-hosts=/etc/hosts.dnsmasq expand-hosts # Specify the range of IP addresses the DHCP server will lease out to devices, and the duration of the lease -dhcp-range=172.18.100.1,172.18.126.254,1h +{% if network_172 %} + dhcp-range=172.18.100.1,172.18.126.254,1h +{% else %} + dhcp-range=10.10.10.21,10.10.10.253,1h +{% endif %} + # Specify the default route dhcp-option=3,{{ lan_ip }} # Specify the DNS server address diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 9eac09d85..3b223320c 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -99,7 +99,7 @@ disregard_network: False # Use cache, or error out if cache does not exist. iiab_hostname: box iiab_domain: lan lan_ip: 10.10.10.10 -172_network: False +network_172: False #lan_ip: 172.18.96.1 # Use this ip for compatibility with older network systems lan_netmask: 255.255.255.0 #lan_netmask: 255.255.224.0 # Older networks were larger