From 6009270a7ead0c538a033535fbb24e66c917a489 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 14 Feb 2020 01:46:36 -0500 Subject: [PATCH] 0.1.4-DEV-20200214-14428 ------------------------ * ADD: - added support for deployment to specific vlan via -e command line switch; defaults to vlan1 --- defaults/main/dhcpd_vars.yml | 37 ++++++++++++++++++++++++------------ templates/dhcpd_conf.j2 | 16 ++++++++-------- 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/defaults/main/dhcpd_vars.yml b/defaults/main/dhcpd_vars.yml index 52b1d21..8215888 100644 --- a/defaults/main/dhcpd_vars.yml +++ b/defaults/main/dhcpd_vars.yml @@ -1,7 +1,7 @@ --- dhcp_conf_file : /etc/dhcp/dhcpd.conf dhcp_conf_version : 1.0 -dhcp_conf_revision : 20200212-125405 +dhcp_conf_revision : 20200214-13647 dhcp_ddns_style : none @@ -12,16 +12,29 @@ dhcp_domain_name: "thezengarden.net" dhcp_default_lease : 86400 dhcp_max_lease : 604800 - -dhcp_subnet : 10.1.1.0 -dhcp_netmask : 255.255.255.0 -dhcp_router : 10.1.1.10 -dhcp_range_from : 10.1.1.161 -dhcp_range_to : 10.1.1.199 -dhcp_broadcast : 10.1.1.255 -dhcp_dns : 10.1.1.210 +dhcp_pxeboot_file : pxelinux.0 -# pxeboot stuff -pxeboot_file : pxelinux.0 -pxeboot_server : 10.1.1.193 +dhcp_deploy_to: vlan1 + + +dhcp_networks: + vlan1: + subnet : 10.1.1.0 + netmask : 255.255.255.0 + router : 10.1.1.10 + range_from : 10.1.1.161 + range_to : 10.1.1.199 + broadcast : 10.1.1.255 + dns : 10.1.1.210 + pxeboot : 10.1.1.193 + + vlan55: + subnet : 10.10.10.128 + netmask : 255.255.255.224 + router : 10.10.10.158 + range_from : 10.10.10.147 + range_to : 10.10.10.149 + broadcast : 10.10.10.159 + dns : 10.1.1.210 + pxeboot : 10.10.10.129 diff --git a/templates/dhcpd_conf.j2 b/templates/dhcpd_conf.j2 index 6815e09..e9d1b2d 100644 --- a/templates/dhcpd_conf.j2 +++ b/templates/dhcpd_conf.j2 @@ -2,7 +2,7 @@ # The Zen Garden Network # # # # Configuration : {{ dhcp_conf_file }} # -# Version : {{ dhcp_conf_version }}-{{ dhcp_conf_revision }} # +# Version : {{ dhcp_conf_version }}-{{ dhcp_conf_revision }} # # # # Chris H. # ##################################################### @@ -19,14 +19,14 @@ max-lease-time {{ dhcp_max_lease }}; authoritative; {% endif %} -subnet {{ dhcp_subnet }} netmask {{ dhcp_netmask }} +subnet {{ dhcp_networks[dhcp_deploy_to].subnet }} netmask {{ dhcp_networks[dhcp_deploy_to].netmask }} { - range {{ dhcp_range_from }} {{ dhcp_range_to }}; - option routers {{ dhcp_router }}; - option broadcast-address {{ dhcp_broadcast }}; + range {{ dhcp_networks[dhcp_deploy_to].range_from }} {{ dhcp_networks[dhcp_deploy_to].range_to }}; + option routers {{ dhcp_networks[dhcp_deploy_to].router }}; + option broadcast-address {{ dhcp_networks[dhcp_deploy_to].broadcast }}; option domain-name "{{ dhcp_domain_name }}"; - option domain-name-servers {{ dhcp_dns }}; + option domain-name-servers {{ dhcp_networks[dhcp_deploy_to].dns }}; - filename "{{ pxeboot_file }}"; - next-server {{ pxeboot_server }}; + filename "{{ dhcp_pxeboot_file }}"; + next-server {{ dhcp_networks[dhcp_deploy_to].pxeboot }}; }