ansible-roles/ansible-dhcpd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Spacing fix

Browse Source
This commit is contained in:
RedRampage 2014-11-28 13:00:19 +03:00
parent f1fb16b4a0
commit 0d378f8441
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
defaults/main.yml
View File

@ -163,7 +163,7 @@ dhcpd_includes: []
# ---- ISC DHCP failover configuration ---- # ---- 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. # than two nodes failover is allowed by isc-dhcpd currently.
# #
# You must specify which failover each pool should use by specifying a # 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: # Each failover declaration has a set of an mandatory fields, which is:
# primary: "" Ansible inventory name of a primary DHCP host, if # 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. # see primary_fo_addr option below.
# #
# secondary: "" Ansible inventory name of a secondary DHCP host, if # 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. # see secondary_fo_addr option below.
# #
# Ansible inventory name is either IP ot hostname specified in inventory file. # Ansible inventory name is either IP ot hostname specified in inventory file.
# #
# mclt: 3600 Max Client Lead Time. The maximum amount of time # mclt: 3600 Max Client Lead Time. The maximum amount of time
# that one server can extend a lease for a DHCP # that one server can extend a lease for a DHCP
# client beyond the time known by the partner server. # client beyond the time known by the partner server.
# #
# split: [0-255] Specifies the split between the primary and # split: [0-255] Specifies the split between the primary and
@ -217,12 +217,12 @@ dhcpd_includes: []
# currently unsupported. # currently unsupported.
# #
# primary_fo_addr: "" IP/Hostname of a primary DHCP host. This option # 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. # from ansible inventory IP/hostname.
# If omitted, then 'primary' is used. # If omitted, then 'primary' is used.
# #
# secondary_fo_addr: "" IP/Hostname of a secondary DHCP host. This option # 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. # from ansible inventory IP/hostname.
# If omitted, then 'secondary' is used. # If omitted, then 'secondary' is used.
# #
@ -262,3 +262,4 @@ dhcpd_failovers: []
# split: 128 # split: 128
# max_response_delay: 5 # max_response_delay: 5
# max_unacked_updates: 10 # max_unacked_updates: 10

7
templates/etc/dhcp/dhcpd.conf.j2
View File

@ -120,10 +120,6 @@ host {{ host.hostname }} {
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endmacro %} {% endmacro %}
{% macro print_failover(failover) %} {% macro print_failover(failover) %}
{% if failover.comment is defined and failover.comment %} {% if failover.comment is defined and failover.comment %}
# {{ failover.comment }} # {{ failover.comment }}
@ -183,9 +179,6 @@ failover peer "{{ failover.failover }}" {
} }
{% endmacro %} {% endmacro %}
{% if dhcpd_authoritative is defined and dhcpd_authoritative %} {% if dhcpd_authoritative is defined and dhcpd_authoritative %}
authoritative; authoritative;