ansible_roles/zen_dhcpd
1
0
Fork 0
Code Pull Requests Activity

0.1.8-DEV-20200215-125347

Browse Source 
-------------------------
    * ADD:
      - added vlan66 support

    * MODIFY:
      - modified templates/dhcpd_conf.j2 to utilize static assignments only if defined
This commit is contained in:
Chris Hammer 2020-02-15 00:54:45 -05:00
parent e6dc9047d4
commit b23b0c58b9
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
defaults/main/dhcpd_vars.yml
View File

@ -1,7 +1,7 @@
--- ---
dhcp_conf_file : /etc/dhcp/dhcpd.conf dhcp_conf_file : /etc/dhcp/dhcpd.conf
dhcp_conf_version : 1.0 dhcp_conf_version : 1.0
dhcp_conf_revision : 20200214-13647 dhcp_conf_revision : 20200215-124911
dhcp_ddns_style : none dhcp_ddns_style : none
@ -33,8 +33,18 @@ dhcp_networks:
subnet : 10.10.10.128 subnet : 10.10.10.128
netmask : 255.255.255.224 netmask : 255.255.255.224
router : 10.10.10.158 router : 10.10.10.158
range_from : 10.10.10.147 range_from : 10.10.10.129
range_to : 10.10.10.149 range_to : 10.10.10.158
broadcast : 10.10.10.159 broadcast : 10.10.10.159
dns : 10.1.1.210 dns : 10.1.1.210
pxeboot : 10.10.10.129 pxeboot : 10.10.10.129
vlan66:
subnet : 10.10.10.224
netmask : 255.255.255.224
router : 10.10.10.254
range_from : 10.10.10.226
range_to : 10.10.10.253
broadcast : 10.10.10.255
dns : 10.1.1.210
pxeboot : 10.10.10.225

6
templates/dhcpd_conf.j2
View File

@ -2,7 +2,7 @@
# The Zen Garden Network # # The Zen Garden Network #
# # # #
# Configuration : {{ dhcp_conf_file }} # # Configuration : {{ dhcp_conf_file }} #
# Version : {{ dhcp_conf_version }}-{{ dhcp_conf_revision }} # # Version : {{ dhcp_conf_version }}-{{ dhcp_conf_revision }} #
# # # #
# Chris H. <chris@thezengarden.net> # # Chris H. <chris@thezengarden.net> #
##################################################### #####################################################
@ -30,7 +30,7 @@ subnet {{ dhcp_networks[dhcp_vlan].subnet }} netmask {{ dhcp_networks[dhcp_vlan]
filename "{{ dhcp_pxeboot_file }}"; filename "{{ dhcp_pxeboot_file }}";
next-server {{ dhcp_networks[dhcp_vlan].pxeboot }}; next-server {{ dhcp_networks[dhcp_vlan].pxeboot }};
{% if static_assignments is defined %}
### STATIC ASSIGNMENTS ### ### STATIC ASSIGNMENTS ###
{% for host in static_assignments %} {% for host in static_assignments %}
host {{ host }} host {{ host }}
@ -39,5 +39,5 @@ subnet {{ dhcp_networks[dhcp_vlan].subnet }} netmask {{ dhcp_networks[dhcp_vlan]
fixed-address {{ static_assignments[host]['ip_address'] }}; fixed-address {{ static_assignments[host]['ip_address'] }};
} }
{% endfor %} {% endfor %}
{% endif %}
} }