Merge branch 'master' of 185.52.224.4:020-wireless/020_dns

dns/hostfiles/amsw_tunnel

@@ -18,3 +18,4 @@
 10.205.252.12 sn1
 10.205.252.13 bprouter
 10.205.252.14 sofrouter
+10.205.252.15 testrouter_adm

dns/hostfiles/routers

@@ -13,6 +13,6 @@
 10.205.253.11 gwl
 10.205.253.12 dwk
 10.205.253.13 hemelvaart
-10.205.253.14 bprouter
-10.205.253.15 sofrouter
-
+10.205.253.14 bprouter # rtr01.lag.amsw.nl
+10.205.253.15 sofrouter # rtr01.sof.amsw.nl
+10.205.253.16 dcgrouter

dns/hostfiles/transfernet

@@ -100,17 +100,17 @@
 10.205.255.62 dwk-gwl-dwk # gwl.rtr01.dwk.amsw.nl
 10.205.255.63 dwk-gwl-gwl # dwk.rtr01.gwl.amsw.nl
 
-# WFC -> LAG + SOF vlan?
+# WFC -> LAG + SOF untagged
 # 10.205.255.80/28
 10.205.255.80 net29-wfc-lag
-10.205.255.81 wfc-90-120-router-wfc #beckers
-10.205.255.82 wfc-90-120-client-powerbeam-notinuse
-10.205.255.83 wfc-90-120-client-powerbeam-sofia
-10.205.255.84 wfc-90-120-client-litebeam-lag
-10.205.255.85 wfc-90-120-ap-sector-wfc
-10.205.255.86 wfc-90-120-router-lag
-10.205.255.87 wfc-90-120-router-sof
-10.205.255.88 wfc-90-120-lagtop #for configuration
+10.205.255.81 router-wfc # 102.rtr01.wfc.amsw.nl
+10.205.255.82 client-powerbeam-lag # clientwfc.lag.amsw.nl
+10.205.255.83 client-powerbeam-sofia # clientwfc.sof.amsw.nl
+10.205.255.84 nothing
+10.205.255.85 nothing
+10.205.255.86 router-lag # wfc.rtr01.lag.amsw.nl
+10.205.255.87 router-sof # wfc.rtr01.sof.amsw.nl
+10.205.255.88 lagtop #for configuration
 10.205.255.89 nothing
 10.205.255.90 nothing
 10.205.255.91 nothing