Skip to content

Commit

Permalink
dhcp/dns cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@hicksg
hicksg committed Jan 25, 2016
1 parent b4a2545 commit ee00ef9
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 56 deletions.
31 changes: 13 additions & 18 deletions dhcp01/etc/dhcp/dhcpd.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@ subnet 192.168.0.0 netmask 255.255.224.0 {
fixed-address 192.168.10.8;
}

host mp-host {
hardware ethernet 0c:c4:7a:30:05:2b;
fixed-address 192.168.10.14;
}

host mp-core-services {
hardware ethernet 52:54:00:a9:b6:6c;
fixed-address 192.168.10.15;
Expand Down Expand Up @@ -122,7 +117,7 @@ subnet 192.168.68.0 netmask 255.255.254.0 {
}

host HPETop {
hardware ethernet b4:75:0e:bb:34:a0;
hardware ethernet B4:75:0E:BB:34:9F;
fixed-address 192.168.68.11;
}

Expand Down Expand Up @@ -201,11 +196,6 @@ subnet 192.168.68.0 netmask 255.255.254.0 {
fixed-address 192.168.68.123;
}

host osexec2 {
hardware ethernet 00:25:90:4e:e4:6a;
fixed-address 192.168.68.124;
}

host muse {
hardware ethernet 00:30:48:92:d8:22;
fixed-address 192.168.68.132;
Expand All @@ -226,19 +216,24 @@ subnet 192.168.68.0 netmask 255.255.254.0 {
fixed-address 192.168.68.146;
}

host osexec3 {
hardware ethernet 00:25:90:60:57:8c;
fixed-address 192.168.68.148;
host antelope {
hardware ethernet AC:BC:32:BC:81:1B;
fixed-address 192.168.68.193;
}

host oscore2 {
hardware ethernet 0c:c4:7a:30:05:2b;
fixed-address 192.168.68.217;
}

host osexec1 {
hardware ethernet 00:25:90:4e:ad:64;
fixed-address 192.168.68.191;
fixed-address 192.168.68.218;
}

host antelope {
hardware ethernet AC:BC:32:BC:81:1B;
fixed-address 192.168.68.193;
host osexec2 {
hardware ethernet 00:25:90:4e:e4:6a;
fixed-address 192.168.68.219;
}

host cisco2960 {
Expand Down
4 changes: 2 additions & 2 deletions dns01/var/named/master/internal/192.168.0.zone
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$ORIGIN 0.168.192.in-addr.arpa.
$TTL 86400
@ IN SOA ns1.stackato.com. root (
2015122200 ; serial
2016012500 ; serial
3H ; refresh
15M ; retry
1W ; expiry
Expand All @@ -14,7 +14,7 @@ $TTL 86400
2 IN PTR unknown.stackato.com.
3 IN PTR aszero1.stackato.com.
4 IN PTR unknown.stackato.com.
5 IN PTR aszero2.stackato.com.
5 IN PTR unknown.stackato.com.
6 IN PTR unknown.stackato.com.
7 IN PTR unknown.stackato.com.
8 IN PTR unknown.stackato.com.
Expand Down
4 changes: 2 additions & 2 deletions dns01/var/named/master/internal/192.168.10.zone
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$ORIGIN 10.168.192.in-addr.arpa.
$TTL 86400
@ IN SOA ns1.stackato.com. root (
2015122200 ; serial
2016012500 ; serial
3H ; refresh
15M ; retry
1W ; expiry
Expand All @@ -23,7 +23,7 @@ $TTL 86400
11 IN PTR unknown.stackato.com.
12 IN PTR unknown.stackato.com.
13 IN PTR unknown.stackato.com.
14 IN PTR mp-host.stackato.com.
14 IN PTR unknown.stackato.com.
15 IN PTR mp.stackato.com.
16 IN PTR mp-dea1.stackato.com.
17 IN PTR mp-dea2.stackato.com.
Expand Down
10 changes: 5 additions & 5 deletions dns01/var/named/master/internal/192.168.30.zone
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$ORIGIN 30.168.192.in-addr.arpa.
$TTL 86400
@ IN SOA ns1.stackato.com. root (
2015122200 ; serial
2016012500 ; serial
3H ; refresh
15M ; retry
1W ; expiry
Expand All @@ -10,10 +10,10 @@ $TTL 86400
IN NS ns1.stackato.com.
IN NS ns2.stackato.com.

1 IN PTR oscore.stackato.com.
2 IN PTR osexec1.stackato.com.
3 IN PTR osexec2.stackato.com.
4 IN PTR osexec3.stackato.com.
1 IN PTR unknown.stackato.com.
2 IN PTR unknown.stackato.com.
3 IN PTR unknown.stackato.com.
4 IN PTR unknown.stackato.com.
5 IN PTR osfloat1.stackato.com.
6 IN PTR osfloat2.stackato.com.
7 IN PTR osfloat3.stackato.com.
Expand Down
32 changes: 16 additions & 16 deletions dns01/var/named/master/internal/192.168.68.zone
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$ORIGIN 68.168.192.in-addr.arpa.
$TTL 86400
@ IN SOA ns1.stackato.com. root (
2015122200 ; serial
2016012500 ; serial
3H ; refresh
15M ; retry
1W ; expiry
Expand All @@ -20,7 +20,7 @@ $TTL 86400
8 IN PTR hpeac.stackato.com.
9 IN PTR hpehigh.stackato.com.
10 IN PTR pm01.stackato.com.
11 IN PTR unknown.stackato.com.
11 IN PTR hpetop.stackato.com.
12 IN PTR unknown.stackato.com.
13 IN PTR unknown.stackato.com.
14 IN PTR unknown.stackato.com.
Expand Down Expand Up @@ -133,8 +133,8 @@ $TTL 86400
121 IN PTR vsphere1.stackato.com.
122 IN PTR vsphere2.stackato.com.
123 IN PTR vsphere3.stackato.com.
124 IN PTR osexec2.stackato.com.
125 IN PTR oscore.stackato.com.
124 IN PTR unknown.stackato.com.
125 IN PTR unknown.stackato.com.
126 IN PTR unknown.stackato.com.
127 IN PTR stackato-xen.stackato.com.
128 IN PTR unknown.stackato.com.
Expand All @@ -157,7 +157,7 @@ $TTL 86400
145 IN PTR vpool07.stackato.com.
146 IN PTR vpool06.stackato.com.
147 IN PTR unknown.stackato.com.
148 IN PTR osexec3.stackato.com.
148 IN PTR unknown.stackato.com.
149 IN PTR dhcp.stackato.com.
150 IN PTR dhcp.stackato.com.
151 IN PTR dhcp.stackato.com.
Expand Down Expand Up @@ -200,7 +200,7 @@ $TTL 86400
188 IN PTR dhcp.stackato.com.
189 IN PTR dhcp.stackato.com.
190 IN PTR unknown.stackato.com.
191 IN PTR osexec1.stackato.com.
191 IN PTR unknown.stackato.com.
192 IN PTR unknown.stackato.com.
193 IN PTR antelope.stackato.com.
194 IN PTR unknown.stackato.com.
Expand All @@ -225,21 +225,21 @@ $TTL 86400
213 IN PTR unknown.stackato.com.
214 IN PTR unknown.stackato.com.
215 IN PTR unknown.stackato.com.
216 IN PTR unknown.stackato.com.
217 IN PTR unknown.stackato.com.
218 IN PTR unknown.stackato.com.
219 IN PTR unknown.stackato.com.
216 IN PTR oscore1.stackato.com.
217 IN PTR oscore2.stackato.com.
218 IN PTR osexec1.stackato.com.
219 IN PTR osexec2.stackato.com.
220 IN PTR ostack-220.stackato.com.
221 IN PTR ostack-221.stackato.com.
222 IN PTR unknown.stackato.com.
222 IN PTR ostack-222.stackato.com.
223 IN PTR ostack-223.stackato.com.
224 IN PTR ostack-224.stackato.com.
225 IN PTR ostack-225.stackato.com.
226 IN PTR stackato-pkg-gen-outer.stackato.com.
227 IN PTR stackato-pkg-test-outer.stackato.com.
228 IN PTR stackato-pkg-gen-inner.stackato.com.
229 IN PTR stackato-pkg-test-inner.stackato.com.
230 IN PTR stackato-pkg-custom.stackato.com.
226 IN PTR ostack-226.stackato.com.
227 IN PTR ostack-227.stackato.com.
228 IN PTR ostack-228.stackato.com.
229 IN PTR ostack-229.stackato.com.
230 IN PTR ostack-230.stackato.com.
231 IN PTR ostack-231.stackato.com.
232 IN PTR ostack-232.stackato.com.
233 IN PTR ostack-233.stackato.com.
Expand Down
2 changes: 1 addition & 1 deletion dns01/var/named/master/internal/192.168.69.zone
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$ORIGIN 69.168.192.in-addr.arpa.
$TTL 86400
@ IN SOA ns1.stackato.com. root (
2015122200 ; serial
2016012500 ; serial
3H ; refresh
15M ; retry
1W ; expiry
Expand Down
22 changes: 10 additions & 12 deletions dns01/var/named/master/internal/stackato.com.zone
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$ORIGIN stackato.com.
$TTL 86400
@ IN SOA ns1.stackato.com. root (
2016011400 ; serial
2016012500 ; serial
3H ; refresh
15 ; retry
1w ; expire
Expand All @@ -20,7 +20,6 @@ aok IN CNAME api
ape IN A 192.168.68.112
api IN A 15.125.91.96
aszero1 IN A 192.168.0.3
aszero2 IN A 192.168.0.5
backups01 IN A 192.168.68.27
beta IN CNAME unbouncepages.com.
bzr IN CNAME gitolite
Expand Down Expand Up @@ -72,7 +71,6 @@ mp IN A 192.168.10.15
*.mp IN CNAME mp
mp-dea1 IN A 192.168.10.16
mp-dea2 IN A 192.168.10.17
mp-host IN A 192.168.10.14
muse IN A 192.168.68.132
nas2 IN A 192.168.69.204
*.nas2 IN CNAME nasweb
Expand All @@ -84,10 +82,10 @@ ns1 IN A 192.168.68.3
ns2 IN A 192.168.68.4
opboard IN CNAME api
openproject IN CNAME ec2.stacktest.io.
oscore IN A 192.168.30.1
osexec1 IN A 192.168.30.2
osexec2 IN A 192.168.30.3
osexec3 IN A 192.168.30.4
oscore1 IN A 192.168.68.216
oscore2 IN A 192.168.68.217
osexec1 IN A 192.168.68.218
osexec2 IN A 192.168.68.219
osfloat01 IN A 192.168.30.5
*.osfloat01 IN CNAME osfloat01
osfloat02 IN A 192.168.30.6
Expand Down Expand Up @@ -157,6 +155,11 @@ ostack-221 IN A 192.168.68.221
ostack-223 IN A 192.168.68.223
ostack-224 IN A 192.168.68.224
ostack-225 IN A 192.168.68.225
ostack-226 IN A 192.168.68.226
ostack-227 IN A 192.168.68.227
ostack-228 IN A 192.168.68.228
ostack-229 IN A 192.168.68.229
ostack-230 IN A 192.168.68.230
ostack-231 IN A 192.168.68.231
ostack-232 IN A 192.168.68.232
ostack-233 IN A 192.168.68.233
Expand Down Expand Up @@ -204,11 +207,6 @@ stackato-image-factory IN CNAME ape
stackato-nightly IN A 192.168.68.111
stackato-nightly-vsphere IN A 192.168.68.138
*.stackato-nightly-vsphere IN CNAME stackato-nightly-vsphere
stackato-pkg-custom IN A 192.168.68.230
stackato-pkg-gen-inner IN A 192.168.68.228
stackato-pkg-gen-outer IN A 192.168.68.226
stackato-pkg-test-inner IN A 192.168.68.229
stackato-pkg-test-outer IN A 192.168.68.227
stackato-xen IN A 192.168.68.127
stackatoaws IN A 50.19.222.182
*.stackatoaws IN CNAME stackatoaws
Expand Down

0 comments on commit ee00ef9

Please sign in to comment.