diff --git a/defaults/main.yml b/defaults/main.yml index 0b3c73c..295dee3 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -163,7 +163,7 @@ dhcpd_includes: [] # ---- ISC DHCP failover configuration ---- # -# Each failover declaration consists of primary and secondary host, no more +# Each failover declaration consists of primary and secondary host, no more # than two nodes failover is allowed by isc-dhcpd currently. # # You must specify which failover each pool should use by specifying a @@ -171,17 +171,17 @@ dhcpd_includes: [] # # Each failover declaration has a set of an mandatory fields, which is: # primary: "" Ansible inventory name of a primary DHCP host, if -# you need failover to work on different IP, +# you need failover to work on different IP, # see primary_fo_addr option below. # # secondary: "" Ansible inventory name of a secondary DHCP host, if -# you need failover to work on different IP, +# you need failover to work on different IP, # see secondary_fo_addr option below. # # Ansible inventory name is either IP ot hostname specified in inventory file. # -# mclt: 3600 Max Client Lead Time. The maximum amount of time -# that one server can extend a lease for a DHCP +# mclt: 3600 Max Client Lead Time. The maximum amount of time +# that one server can extend a lease for a DHCP # client beyond the time known by the partner server. # # split: [0-255] Specifies the split between the primary and @@ -217,12 +217,12 @@ dhcpd_includes: [] # currently unsupported. # # primary_fo_addr: "" IP/Hostname of a primary DHCP host. This option -# is used if you need failover address be different +# is used if you need failover address be different # from ansible inventory IP/hostname. # If omitted, then 'primary' is used. # # secondary_fo_addr: "" IP/Hostname of a secondary DHCP host. This option -# is used if you need failover address be different +# is used if you need failover address be different # from ansible inventory IP/hostname. # If omitted, then 'secondary' is used. # @@ -262,3 +262,4 @@ dhcpd_failovers: [] # split: 128 # max_response_delay: 5 # max_unacked_updates: 10 + diff --git a/templates/etc/dhcp/dhcpd.conf.j2 b/templates/etc/dhcp/dhcpd.conf.j2 index 3b28cf4..7fa18df 100644 --- a/templates/etc/dhcp/dhcpd.conf.j2 +++ b/templates/etc/dhcp/dhcpd.conf.j2 @@ -120,10 +120,6 @@ host {{ host.hostname }} { {% endfor %} {% endif %} {% endmacro %} - - - - {% macro print_failover(failover) %} {% if failover.comment is defined and failover.comment %} # {{ failover.comment }} @@ -183,9 +179,6 @@ failover peer "{{ failover.failover }}" { } {% endmacro %} - - - {% if dhcpd_authoritative is defined and dhcpd_authoritative %} authoritative;