From 30fd032a5983d9a320d7cd48a7e105983f4308b8 Mon Sep 17 00:00:00 2001 From: Markus Hauschild Date: Mon, 23 Jan 2017 19:26:35 +0100 Subject: [PATCH] Change client network gateways. --- group_vars/kitchen | 2 +- roles/dhcpd/templates/dhcp/dhcpd.conf.j2 | 4 ++-- roles/dns/templates/bind/23.172.in-addr.arpa.zone.j2 | 6 +++--- roles/dns/templates/bind/binary.kitchen.zone.j2 | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/group_vars/kitchen b/group_vars/kitchen index 7281a15..ac5ac88 100644 --- a/group_vars/kitchen +++ b/group_vars/kitchen @@ -5,8 +5,8 @@ dhcpd_primary: 172.23.2.3 dhcpd_secondary: 172.23.2.4 name_servers: -- 172.23.2.1 - 172.23.2.3 +- 172.23.2.4 ntp_servers: - 172.23.1.61 diff --git a/roles/dhcpd/templates/dhcp/dhcpd.conf.j2 b/roles/dhcpd/templates/dhcp/dhcpd.conf.j2 index 8ba9a32..a1be3ea 100644 --- a/roles/dhcpd/templates/dhcp/dhcpd.conf.j2 +++ b/roles/dhcpd/templates/dhcp/dhcpd.conf.j2 @@ -57,7 +57,7 @@ subnet 172.23.2.0 netmask 255.255.255.0 { # Members subnet 172.23.3.0 netmask 255.255.255.0 { - option routers 172.23.3.254; + option routers 172.23.3.1; pool { {% if dhcpd_failover == true %} failover peer "failover-partner"; @@ -68,7 +68,7 @@ subnet 172.23.3.0 netmask 255.255.255.0 { # Guests subnet 172.23.4.0 netmask 255.255.255.0 { - option routers 172.23.4.254; + option routers 172.23.4.1; pool { {% if dhcpd_failover == true %} failover peer "failover-partner"; diff --git a/roles/dns/templates/bind/23.172.in-addr.arpa.zone.j2 b/roles/dns/templates/bind/23.172.in-addr.arpa.zone.j2 index dce3fce..e799422 100644 --- a/roles/dns/templates/bind/23.172.in-addr.arpa.zone.j2 +++ b/roles/dns/templates/bind/23.172.in-addr.arpa.zone.j2 @@ -1,7 +1,7 @@ $ORIGIN 23.172.in-addr.arpa. ; base for unqualified names $TTL 1h ; default time-to-live @ IN SOA ns.binary.kitchen. hostmaster.binary.kitchen. ( - 2017012301; serial + 2017012302; serial 1d; refresh 2h; retry 4w; expire @@ -30,11 +30,11 @@ $TTL 1h ; default time-to-live 91.2 IN PTR spiegelei.binary.kitchen. 254.2 IN PTR v2302.core.binary.kitchen. ; Members +1.3 IN PTR v2303.core.binary.kitchen. $GENERATE 10-240 $.3 IN PTR dhcp-${0,3,d}-03.binary.kitchen. -254.3 IN PTR v2303.core.binary.kitchen. ; Guests +1.4 IN PTR v2304.core.binary.kitchen. $GENERATE 10-240 $.4 IN PTR dhcp-${0,3,d}-04.binary.kitchen. -254.4 IN PTR v2304.core.binary.kitchen. ; Management RZ 23.8 IN PTR cernunnos.binary.kitchen. 61.8 IN PTR ruben.binary.kitchen. diff --git a/roles/dns/templates/bind/binary.kitchen.zone.j2 b/roles/dns/templates/bind/binary.kitchen.zone.j2 index 8732403..4f18e68 100644 --- a/roles/dns/templates/bind/binary.kitchen.zone.j2 +++ b/roles/dns/templates/bind/binary.kitchen.zone.j2 @@ -1,7 +1,7 @@ $ORIGIN binary.kitchen ; base for unqualified names $TTL 1h ; default time-to-live @ IN SOA ns.binary.kitchen. hostmaster.binary.kitchen. ( - 2017012301; serial + 2017012302; serial 1d; refresh 2h; retry 4w; expire @@ -41,11 +41,11 @@ punsch IN A 172.23.2.60 spiegelei IN A 172.23.2.91 v2302.core IN A 172.23.2.254 ; Members +v2303.core IN A 172.23.3.1 $GENERATE 1-240 dhcp-${0,3,d}-03 IN A 172.23.3.$ -v2303.core IN A 172.23.3.254 ; Guests +v2304.core IN A 172.23.4.1 $GENERATE 1-240 dhcp-${0,3,d}-04 IN A 172.23.4.$ -v2304.core IN A 172.23.4.254 ; Management RZ cernunnos IN A 172.23.8.23 ruben IN A 172.23.8.61