dhcp: fix silly mix-ups

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

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

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

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

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 %}
        }
 }