aurore/ansible
aurore/ansible
15
2
Fork 0
Code Issues 1 Pull requests 13 Releases Wiki Activity

dhcp: fix silly mix-ups

Browse source
This commit is contained in:
Yohaï-Eliel BERREBY 2020-04-05 19:48:56 +02:00
parent 6b369d5b28
commit 2a0a2e2ac6
5 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
base.yml
View file

@ -10,6 +10,12 @@
roles: roles:
- ldap-client - ldap-client
# Set up DHCP servers.
- hosts: dhcp
roles:
- isc-dhcp-server
# Clone LDAP on local geographic location # Clone LDAP on local geographic location
# DON'T DO THIS AS IT RECREATES THE REPLICA # DON'T DO THIS AS IT RECREATES THE REPLICA
#- hosts: ldap-replica #- hosts: ldap-replica

3
group_vars/fleming/dhcp.yml
View file

@ -6,6 +6,3 @@ subnet_ids:
users_wired: 10 users_wired: 10
users_wifi: 11 users_wifi: 11
failover:
own-address: 10.128.2.254
peer-address: 10.128.2.154

4
group_vars/pacaterie/dhcp.yml
View file

@ -5,3 +5,7 @@ subnet_ids:
ap: 142 ap: 142
users_wired: 20 users_wired: 20
users_wifi: 21 users_wifi: 21
failover:
own_address: 10.128.2.254
peer_address: 10.128.2.154

4
hosts
View file

@ -149,9 +149,9 @@ edc_pve
gs_pve gs_pve
[dhcp] [dhcp]
#dhcp-fleming.adm.auro.re dhcp-fleming.adm.auro.re
#dhcp-fleming-backup.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-pacaterie-backup.adm.auro.re
#dhcp-edc.adm.auro.re #dhcp-edc.adm.auro.re
#dhcp-gs.adm.auro.re #dhcp-gs.adm.auro.re

12
roles/isc-dhcp-server/templates/dhcp/dhcpd.conf.j2
View file

@ -20,11 +20,7 @@ ddns-update-style none;
# If this DHCP server is the official DHCP server for the local # If this DHCP server is the official DHCP server for the local
# network, the authoritative directive should be uncommented. # network, the authoritative directive should be uncommented.
{% if dhcp.authoritative %}
authoritative; authoritative;
{% else %}
#authoritative;
{% endif %}
# Use this to send dhcp log messages to a different log file (you also # Use this to send dhcp log messages to a different log file (you also
# have to hack syslog.conf to complete the redirection). # have to hack syslog.conf to complete the redirection).
@ -59,17 +55,17 @@ subnet 10.{{ subnet_ids.users_wired }}.0.0 netmask 255.255.0.0 {
# Users WiFi # 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"; interface "ens21";
option subnet-mask 255.255.0.0; option subnet-mask 255.255.0.0;
option broadcast-address 10.{{ subnet_ids.users_wired }}.255.255; option broadcast-address 10.{{ subnet_ids.users_wifi }}.255.255;
option routers 10.{{ subnet_ids.users_wired }}.0.240; option routers 10.{{ subnet_ids.users_wifi }}.0.240;
option domain-name "wifi.{{ apartment_block }}.auro.re"; option domain-name "wifi.{{ apartment_block }}.auro.re";
option domain-search "auro.re"; option domain-search "auro.re";
include "/var/local/re2o-services/dhcp/generated/dhcp.wifi.{{ apartment_block }}.auro.re.list"; include "/var/local/re2o-services/dhcp/generated/dhcp.wifi.{{ apartment_block }}.auro.re.list";
pool { 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" { failover peer "dhcp-failover" {