From 2a0a2e2ac657e89faeb2cbb987f40c9302672981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoha=C3=AF-Eliel=20BERREBY?= Date: Sun, 5 Apr 2020 19:48:56 +0200 Subject: [PATCH] dhcp: fix silly mix-ups --- base.yml | 6 ++++++ group_vars/fleming/dhcp.yml | 3 --- group_vars/pacaterie/dhcp.yml | 4 ++++ hosts | 4 ++-- .../isc-dhcp-server/templates/dhcp/dhcpd.conf.j2 | 16 ++++++---------- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/base.yml b/base.yml index bafc56b..a668ae5 100644 --- a/base.yml +++ b/base.yml @@ -10,6 +10,12 @@ roles: - ldap-client + +# Set up DHCP servers. +- hosts: dhcp + roles: + - isc-dhcp-server + # Clone LDAP on local geographic location # DON'T DO THIS AS IT RECREATES THE REPLICA #- hosts: ldap-replica diff --git a/group_vars/fleming/dhcp.yml b/group_vars/fleming/dhcp.yml index 97456e9..f0d1f8f 100644 --- a/group_vars/fleming/dhcp.yml +++ b/group_vars/fleming/dhcp.yml @@ -6,6 +6,3 @@ subnet_ids: users_wired: 10 users_wifi: 11 -failover: - own-address: 10.128.2.254 - peer-address: 10.128.2.154 diff --git a/group_vars/pacaterie/dhcp.yml b/group_vars/pacaterie/dhcp.yml index 043d26d..3fdf3c8 100644 --- a/group_vars/pacaterie/dhcp.yml +++ b/group_vars/pacaterie/dhcp.yml @@ -5,3 +5,7 @@ subnet_ids: ap: 142 users_wired: 20 users_wifi: 21 + +failover: + own_address: 10.128.2.254 + peer_address: 10.128.2.154 diff --git a/hosts b/hosts index 2e83677..d8defaf 100644 --- a/hosts +++ b/hosts @@ -149,9 +149,9 @@ edc_pve gs_pve [dhcp] -#dhcp-fleming.adm.auro.re +dhcp-fleming.adm.auro.re #dhcp-fleming-backup.adm.auro.re -#dhcp-pacaterie.adm.auro.re +dhcp-pacaterie.adm.auro.re #dhcp-pacaterie-backup.adm.auro.re #dhcp-edc.adm.auro.re #dhcp-gs.adm.auro.re diff --git a/roles/isc-dhcp-server/templates/dhcp/dhcpd.conf.j2 b/roles/isc-dhcp-server/templates/dhcp/dhcpd.conf.j2 index 2236e6d..5ab2be5 100644 --- a/roles/isc-dhcp-server/templates/dhcp/dhcpd.conf.j2 +++ b/roles/isc-dhcp-server/templates/dhcp/dhcpd.conf.j2 @@ -20,11 +20,7 @@ ddns-update-style none; # If this DHCP server is the official DHCP server for the local # network, the authoritative directive should be uncommented. -{% if dhcp.authoritative %} authoritative; -{% else %} -#authoritative; -{% endif %} # Use this to send dhcp log messages to a different log file (you also # have to hack syslog.conf to complete the redirection). @@ -59,19 +55,19 @@ subnet 10.{{ subnet_ids.users_wired }}.0.0 netmask 255.255.0.0 { # Users WiFi -subnet 10.{{ subnet_ids.users_wired }}.0.0 netmask 255.255.0.0 { +subnet 10.{{ subnet_ids.users_wifi }}.0.0 netmask 255.255.0.0 { interface "ens21"; option subnet-mask 255.255.0.0; - option broadcast-address 10.{{ subnet_ids.users_wired }}.255.255; - option routers 10.{{ subnet_ids.users_wired }}.0.240; + option broadcast-address 10.{{ subnet_ids.users_wifi }}.255.255; + option routers 10.{{ subnet_ids.users_wifi }}.0.240; option domain-name "wifi.{{ apartment_block }}.auro.re"; option domain-search "auro.re"; include "/var/local/re2o-services/dhcp/generated/dhcp.wifi.{{ apartment_block }}.auro.re.list"; pool { - range 10.{{ subnet_ids.users_wired }}.8.0 10.{{ subnet_ids.users_wired }}.10.255; + range 10.{{ subnet_ids.users_wifi }}.8.0 10.{{ subnet_ids.users_wired }}.10.255; - {% if failover is defined %} +{% if failover is defined %} failover peer "dhcp-failover" { primary; split 128; @@ -84,6 +80,6 @@ subnet 10.{{ subnet_ids.users_wired }}.0.0 netmask 255.255.0.0 { max-unacked-updates 10; load balance max seconds 3; } - {% endif %} +{% endif %} } }