Merge branch 'dhcp' into 'newinfra'

[dhcp.yml] fix group_vars

See merge request nounous/ansible!172

group_vars/dhcp.yml

@@ -8,15 +8,15 @@ dhcp:
   subnets:
     - network: "100.64.0.0/16"
       deny_unknown: True
-      vlan: "adh-nat"
+      vlan: "adh_nat"
       default_lease_time: "600"
       max_lease_time: "7200"
       routers: "100.64.0.99"
-      dns: ["100.64.0.101", "100.64.0.102"]
+      dns: ["100.64.0.99"]
       domain_name: "adh-nat.crans.org"
       domain_search: "adh-nat.crans.org"
       options: []
-      lease_file: "/tmp/adh-nat-dhcp.list"
+      lease_file: "/var/local/re2o-services/dhcp/generated/dhcp.adh-nat.crans.org.list"
     - network: "185.230.78.0/24"
       deny_unknown: True
       vlan: "adh"
@@ -27,7 +27,7 @@ dhcp:
       domain_name: "adh.crans.org"
       domain_search: "adh.crans.org"
       options: []
-      lease_file: "/tmp/adh-dhcp.list"
+      lease_file: "/var/local/re2o-services/dhcp/generated/dhcp.adh.crans.org.list"
     - network: "172.16.32.0/22"
       deny_unknown: True
       vlan: "infra"
@@ -37,7 +37,7 @@ dhcp:
       domain_name: "infra.crans.org"
       domain_search: "infra.crans.org"
       options: []
-      lease_file: "/tmp/infra-dhcp.list"
+      lease_file: "/var/local/re2o-services/dhcp/generated/dhcp.infra.crans.org.list"
 
 re2o:
   server: re2o.adm.crans.org
@@ -46,4 +46,4 @@ re2o:
   dhcp:
     uri: "/tmp/re2o-dhcp.git"
 
-mail_server: smtp.new-infra.adm.crans.org
+mail_server: smtp.adm.crans.org