diff --git a/pages/DallasPoP.md b/pages/DallasPoP.md
index 7920c97..3b80521 100644
--- a/pages/DallasPoP.md
+++ b/pages/DallasPoP.md
@@ -26,7 +26,39 @@ Shipping Address:
| hostname | switch | ipmi | oob | oobname | pwr | rack | |
| :--------------------------- | ---------------------| ------------ | ------- | ---------- | ---------------------------| ----- | ------------------------------------- |
-| o2.dfw.rg.net | sw99-42 | | 1.8 | o2 | | | Cyclades® ACS Advanced Console Server |
+| o2.dfw.rg.net | sw0.35 | | 1.8 | o2 | | | Cyclades® ACS Advanced Console Server |
+| [equnix IX fiber] | 0.46 | | | | | | |
+| r1.dfw.rg.net.2/2/0 | 0.07 | | 2.15 | r1 | | 0.13-17 | LAN |
+| r1.dfw.rg.net.2/2/1 | 2.03 | | 2.15 | r2 | | 0.13-17 | NTT (VLAN 53) |
+| r2.dfw.rg.net-0/0/1/0 | 2.05 | 0.08 | 2.3 | r2 | | 0.18.19 | NTT VLAN 50 |
+| r2.dfw.rg.net.0/1/1 | 2.06 | | 2.3 | | | 0.18.19 | LAN |
+| o1.dfw.rg.net | 0.40 | | 0.aux | | 1.1 | 0.22-23 | |
+| sw0.dfw.rg.net | 2.47 | | 2.13 | sw0 | [^1] | 0.28 | |
+| sw2.dfw.rg.net | 0.47 | | 2.02 | sw2 | [^1] | 0.30 | |
+| vmX.dfw.rg.net | [^1] | 2.31 | 1.10 | vm0 | 0.4/1.4 | 0.31-32 | |
+| raid0.dfw.rg.net | 2.16 | 2.18 | 2.44 | raid0 | 0.5/1.5 | 0.36-38 | |
+| vm0.dfx.rg.net | 2.27 2.25(drbd) | 2.20 | 2.5 | vm0.dfx | pwr0b B1-9 pwr0r B1-9 | 0.40 | |
+| vm1.dfx.rg.net | 2.28 2.26(drbd) | 2.19 | 2.6 | vm1.dfx | pwr0b B1-10 pwr0r B1-10 | 0.41 | |
+| dfw0.psg.com | 2.13 | 2.12 | 2.12 | dfw0 | 0.3/1.3 | 0.43 | |
+| nas1.sql1.ietf.org | [^1] | 2.11 | 2.11 | vm3 | 0.4/1.4 | 1.17 | |
+| vm2.dfw.rg.net | [^1] | 2.33 | 2.43 | vm2 | 0.4/1.4 | 1.18-19 | |
+| vm1.dfw.rg.net | [^1] | 2.32 | 2.42 | vm1 | 0.4/1.4 | 1.20.21 | |
+| vm0.dfw.rg.net | [^1] | 2.31 | 2.41 | vm0 | 0.4/1.4 | 1.22.23 | |
+| b0.noc.ietf.org | [^1] | 2.34 | 2.45 | vm3 | 0.4/1.4 | 1.26 | |
+| sw3.dfw.rg.net | [^1] | 2.34 | 2.30 | sw3 | 0.4/1.4 | 1.30 | |
+| dallas01.mux.peering.usc.edu | 0.38 | | 2.46 | usc | 0.7/1.7 | 1.40 | |
+| rtcolo.daedalus.com | | xx | 2.45 | b0 | xx | 1.41 | |
+| paddington.richosman | 0.22 | | 2.47 | paddington | 0.8/1.8 | 1.42 | |
+| kingsx.richosman.com | 0.21 | | 2.48 | kingsx | 0.6/1.6 | 1.43-44 | |
+| pwr1.red.dfw.rg.net | 0.41 | | 2.9 | pwr1-red | subfl | 26 | |
+| pwr1.blue.dfw.rg.net | 0.41 | | 2.10 | pwr1-blue | subfl | 26 | |
+| pwr0-blue.dfw.rg.net | 0.42 | | 2.16 | pwr0-blue | subfl | - | |
+| pwr0-red.dfw.rg.net | 0.42 | | 2.17 | pwr0-red | subfl | - | |
+
+Removed
+
+| hostname | switch | ipmi | oob | oobname | pwr | rack | |
+| :--------------------------- | ---------------------| ------------ | ------- | ---------- | ---------------------------| ----- | ------------------------------------- |
| r0.dfw.rg.net-rp0 | 0.45 | | 0.01 | r00 | subfl | 03-13 | |
| r0.dfw.rg.net-rp0mgt | 0.33 | | | | | 03-13 | |
| r0.dfw.rg.net-rp1 | 0.?? | | 0.02 | r01 | | 03-13 | |
@@ -35,31 +67,7 @@ Shipping Address:
| [r0.2/0/5 ntt fiber] | 0.05 | | | | | 03-13 | |
| [r0.2/0/6 spare] | 0.06 | | | | | 03-13 | |
| [r0.2/0/7 equinix ix] | 0.15 | | | | | 03-13 | |
-| sw0.dfw.rg.net | | | 0.13 | sw0 | [^1] | 17 | |
-| [equnix IX fiber] | 0.46 | | | | | | |
-| r1.dfw.rg.net.2/0 | 0.07 | | | r1 | | 18-21 | |
-| r1.dfw.rg.net.2/1 | 0.08 | | | | | 18-21 | |
-| r1.dfw.rg.net.2/2 | 0.09 | | | | | 18-21 | |
-| r1.dfw.rg.net.2/3 | 0.10 | | | | | 18-21 | |
-| r1.dfw.rg.net.mgt | 0.43 | | | | | 18-21 | |
-| o1.dfw.rg.net | 0.40 | | 0.aux | | 1.1 | 22 | |
-| panduit cover-up | | | | | | 23 | |
-| o0.dfw.rg.net | 0.44 | | 1.aux | | 0.1 | 24 | |
-| pwr1.dfw.rg.net | 0.42 | o2.9 / o2.10 | 0.15 | pwr1 | subfl | 26 | |
-| pwr0-blue.dfw.rg.net | 0.18 | | o2.16 | pwr0-blue | subfl | - | |
-| raid0.dfw.rg.net | 0.12 | 0.26 | 0.04 | nfs0 | 0.5/1.5 | 31-33 | |
-| dfw0.psg.com | 0.11 | 0.31 | 0.03 | dfw0 | 0.3/1.3 | 34 | |
-| sw1.dfw.rg.net | 0.46 | | 1.01 | sw1 | [^2] | 35 | ??? |
-| vm0.dfw.rg.net | [^1] | 2.31 | 1.10 | vm0 | 0.4/1.4 | 35-36 | |
-| vm1.dfw.rg.net | [^1] | 2.32 | o2.41 | vm1 | 0.4/1.4 | 35-36 | |
-| vm2.dfw.rg.net | [^1] | 2.33 | o2.42 | vm2 | 0.4/1.4 | 35-36 | |
-| vm3.dfw.rg.net | [^1] | 2.34 | o2.43 | vm3 | 0.4/1.4 | 35-36 | |
-| kingsx.richosman.com | 0.21 | | o2.48 | kingsx | 0.6/1.6 | 37 | |
-| b0.noc.ietf.org | | xx | o2.45 | b0 | xx | 99 | |
-| paddington.richosman | 0.22 | | o2.47 | paddington | 0.8/1.8 | 37 | |
-| vm0.dfx.rg.net | 2.27 2.25(drbd) | 2.20 | 0.25&26 | vm0.dfx | pwr0b B1-9 pwr0r B1-9 | 42 | |
-| vm1.dfx.rg.net | 2.28 2.26(drbd) | 2.19 | 0.27&28 | vm1.dfx | pwr0b B1-10 pwr0r B1-10 | 43 | |
-| dallas01.mux.peering.usc.edu | 0.37/0.39 | | o2.46 | usc | 0.7/1.7 | 44 | |
+| sw1.dfw.rg.net | | | 0.13 | sw1 | [^1] | 0.35 | |
## vm0.dfx.rg.net vm1.dfx.rg.net
@@ -72,115 +80,81 @@ And 8 Samsung 960GB 883 DCT Series - 2.5" SSD SATA 6Gb/s (<1DWPD)
(MZ-7LH960NE)
Serial Numbers: iX1210A-IXN S/N's A1-86827 and A1-86828
-## vm0/1/2/3.dfw.rg.net Ganeti Cluster / 198.180.152.30/31/32/33
-
-VMs are [Supermicro X8DTT-HF Motherboards](http://www.supermicro.com/products/motherboard/QPI/5500/X8DTT-H.cfm?INF=) with 48G of RAM each
- in [827H-R1200B Chassis](http://www.supermicro.com/products/chassis/2U/827/SC827H-R1200.cfm)
- or [SC827H-R1400B Chassis](http://www.supermicro.com/products/chassis/2U/827/SC827H-R1400.cfm)
- 12 SATA-3 250G Drives model WDC WD2502ABYS-0.
-
[^1]: vm servers' ethers are connected to sw2.dfw as follows:
| vm | ipmi | e0 | e1 |
| ---- | ------ | ------ | ------ |
-| vm0 | sw2-32 | sw2-37 | sw2-43 |
-| vm1 | sw2-33 | sw2-38 | sw2-44 |
-| vm2 | sw2-34 | sw2-39 | sw2-45 |
-| vm3 | sw2-35 | sw2-50 | sw2-45 |
+| vm0 | sw2-20 | sw2-25 | sw2-26 |
+| vm1 | sw2-19 | sw2-27 | sw2-28 |
[^2]: PTSS/B is connected to power 0.2/1.2 and controls both sw0 and sw1
-### VM Node Layout (from rear, rack DFW28-04-12)
+### vm[0-1].dfx.rg.net Disk Drives
-| | |
-| ---- | ---- |
-| vm0 | vm2 |
-| vm1 | vm3 |
-| | |
-
-
-### vm[0-3].dfw.rg.net Disk Drives
-
-`for i in a b c; do echo -n "sd$i "; smartctl -a /dev/sd$i | grep Serial; done`
-
-| Bay | vm | drive | Model | Serial | Size | Date | |
-| ---- | ---- | ----- | ---------- | ------------ | ---- | ---------- | ----------------------------- |
-| A0 | vm3 | sdc | WD2000F9YZ | WMC5C0D3HDAV | 2TB | 2015.03.16 | |
-| A1 | vm3 | sdb | WD2000F9YZ | WMC5C0D3TV0R | 2TB | 2015.03.16 | |
-| A2 | vm3 | sda | WD2000F9YZ | WX11D363TV6F | 6TB | 2018.01.10 | was WMC5C0D5KYPP |
-| B0 | vm2 | sdc | WD2000F9YZ | WMC5C0D2NV6N | 2TB | 2015.03.16 | |
-| B1 | vm2 | sdb | WD2005FBYZ | WMC6N0M3AEHR | 2TB | 2018.11.03 | was WMC5C0D623ZS |
-| B2 | vm2 | sda | WD2000F9YZ | WMC5C0D75CRL | 2TB | 2015.03.16 | |
-| C0 | vm1 | sdc | WD2000F9YZ | WMC5C0D61JYX | 2TB | 2015.03.16 | |
-| C1 | vm1 | sdb | WD2000F9YZ | WMC5C0DA1006 | 2TB | 2015.03.16 | |
-| C2 | vm1 | sda | WD2000F9YZ | WMC6N0H8FVYN | 2TB | 2018.01.07 | was WMC5C0D44TEU |
-| D0 | vm0 | sdc | WD2003FYYS | WMAY00749145 | 2TB | 2021.02.21 | was WMC5C0D2APXE |
-| D1 | vm0 | sdb | WD2000F9YZ | WMC5C0D34PT0 | 2TB | 2015.03.16 | |
-| D2 | vm0 | sda | WD2000F9YZ | WMC5C0D2HXNV | 2TB | 2015.03.16 | |
+```
+vm0.dfx.rg.net:/home/randy# for i in a b c d e f g h; do echo -n "sd$i "; smartctl -a /dev/sd$i | egrep "Serial|Model"; done
+sda Device Model: SAMSUNG MZ7LH960HAJR-00005
+Serial Number: S45NNA0R316039
+sdb Device Model: SAMSUNG MZ7LH960HAJR-00005
+Serial Number: S45NNA0R107119
+sdc Device Model: SAMSUNG MZ7LH960HAJR-00005
+Serial Number: S45NNA0R316036
+sdd Device Model: SAMSUNG MZ7LH960HAJR-00005
+Serial Number: S45NNA0R316032
+sde Device Model: SAMSUNG MZ7LH960HAJR-00005
+Serial Number: S45NNA0R303811
+sdf Device Model: SAMSUNG MZ7LH960HAJR-00005
+Serial Number: S45NNA0R316042
+sdg Device Model: SAMSUNG MZ7LH960HAJR-00005
+Serial Number: S45NNA0R107124
+sdh Device Model: SAMSUNG MZ7LH960HAJR-00005
+Serial Number: S45NNA0R316040
+vm1.dfx.rg.net:/home/randy# for i in a b c d e f g h; do echo -n "sd$i "; smartctl -a /dev/sd$i | egrep "Serial|Model"; done
+sda Device Model: SAMSUNG MZ7LH960HAJR-00005
+Serial Number: S45NNA0R316035
+sdb Device Model: SAMSUNG MZ7LH960HAJR-00005
+Serial Number: S45NNA0R303827
+sdc Device Model: SAMSUNG MZ7LH960HAJR-00005
+Serial Number: S45NNA0R316034
+sdd Device Model: SAMSUNG MZ7LH960HAJR-00005
+Serial Number: S45NNA0R303829
+sde Device Model: SAMSUNG MZ7LH960HAJR-00005
+Serial Number: S45NNA0R303777
+sdf Device Model: SAMSUNG MZ7LH960HAJR-00005
+Serial Number: S45NNA0R303803
+sdg Device Model: SAMSUNG MZ7LH960HAJR-00005
+Serial Number: S45NNA0R303764
+sdh Device Model: SAMSUNG MZ7LH960HAJR-00005
+Serial Number: S45NNA0R316031
+```
### Ganeti Cluster / 198.180.152.30/31/32/33
```
-vm0.dfw.rg.net:/root# ./do-stat
-Node DTotal DFree MTotal MNode MFree Pinst Sinst
-vm0.dfw.rg.net 3.6T 3.2T 47.2G 42.4G 39.6G 3 1
-vm1.dfw.rg.net 3.6T 3.4T 47.2G 908M 45.5G 0 1
-vm2.dfw.rg.net 3.6T 2.7T 47.2G 41.0G 36.1G 4 4
-vm3.dfw.rg.net 3.6T 2.8T 47.2G 40.1G 37.3G 4 3
+vm0.dfx.rg.net:/home/randy> sudo gnt-node list
+Node DTotal DFree MTotal MNode MFree Pinst Sinst
+vm0.dfx.rg.net 3.1T 1.6T 251.8G 197.3G 232.2G 6 3
+vm1.dfx.rg.net 3.1T 1.9T 251.8G 26.1G 241.0G 6 6
```
#### Hosts on vm0/1/2/3.dfw.rg.net
| Instance | Primary_node | Secondary_Node | MaxMem | DiskUsage | IP_Address | SysAdmin |
| ------------------- | -------------- | -------------- | ------ | --------- | --------------- | ------------------------------------------ |
-| ca.rg.net | vm3.dfw.rg.net | vm1.dfw.rg.net | 4.0G | 128.0G | 198.180.152.6 | Randy Bush |
-| cu0.dfw.rg.net | vm2.dfw.rg.net | vm3.dfw.rg.net | 512M | 12.0G | 198.180.152.71 | Steven M Bellovin John Koh |
-| git.rg.net | vm3.dfw.rg.net | vm2.dfw.rg.net | 2.0G | 34.0G | 198.180.152.8 | Randy Bush |
-| icir.dfw.rg.net | vm3.dfw.rg.net | vm2.dfw.rg.net | 1.0G | 32.0G | 198.180.152.57 | Bill Marczak |
-| netsrv.dfw.rg.net | vm3.dfw.rg.net | | 1.0G | 100G | 198.180.152.15 | Randy Bush |
-| nms.rg.net | vm3.dfw.rg.net | vm0.dfw.rg.net | 2.0G | 20G | 198.180.152.9 | Randy Bush |
-| petunia.hactrn.net | vm2.dfw.rg,net | | 6G | 120G | 198.180.152.200 | Rob Austein |
-| pfs0.dfw.rg.net | vm0.dfw.rg.net | vm2.dfw.rg.net | 512M | 8.1G | 198.180.152.62 | Randy Bush |
-| rb-build.dfw.rg.net | vm1.dfw.rg.net | vm2.dfw.rg.net | 16G | 150.1G | 198.180.152.62 | Randy Bush
-| sf.rg.net | vm1.dfw.rg.net | | 16G | 728G | 198.180.152.89 | Simone Ferlin
-| wp.rg.net | vm1.dfw.rg.net | | 4G | 64G | 198.180.152.56 | Randy Bush
-| ymbk.com | vm2.dfw.rg.net | vm3.dfw.rg.net | 512M | 16.1G | 198.180.152.10 | Randy Bush |
+| ca.rg.net | vm0.dfw.rg.net | vm1.dfw.rg.net | 4.0G | 128.0G | 198.180.152.6 | Randy Bush |
+| cu0.dfw.rg.net | vm1.dfw.rg.net | vm0.dfw.rg.net | 512M | 12.0G | 198.180.152.71 | Steven M Bellovin John Koh |
+| git.rg.net | vm0.dfw.rg.net | vm1.dfw.rg.net | 2.0G | 34.0G | 198.180.152.8 | Randy Bush |
+| icir.dfw.rg.net | vm0.dfw.rg.net | vm1.dfw.rg.net | 1.0G | 32.0G | 198.180.152.57 | Bill Marczak |
+| netsrv.dfw.rg.net | vm0.dfw.rg.net | vm1.dfw.rg.net | 1.0G | 100G | 198.180.152.15 | Randy Bush |
+| nms.rg.net | vm0.dfw.rg.net | vm1.dfw.rg.net | 2.0G | 20G | 198.180.152.9 | Randy Bush |
+| petunia.hactrn.net | vm0.dfw.rg,net | vm1.dfw.rg.net | 6G | 120G | 198.180.152.200 | Rob Austein |
+| rb-build.dfw.rg.net | vm1.dfw.rg.net | vm0.dfw.rg.net | 16G | 150.1G | 198.180.152.62 | Randy Bush |
+| rpkimancer.rg.net | vm1.dfw.rg.net | | 1G | 16G | 198.180.152.16 | Randy Bush |
+| wp.rg.net | vm1.dfw.rg.net | | 4G | 64G | 198.180.152.56 | Randy Bush |
+| ymbk.com | vm1.dfw.rg.net | vm0.dfw.rg.net | 512M | 16.1G | 198.180.152.10 | Randy Bush |
-## nfs0.dfw.rg.net
-
-### MoBo
-* [PDSME+](http://www.supermicro.com/products/motherboard/Xeon3000/3010/PDSME_.cfm)
-* [AOC-SIM1U+ IPMI Card](http://www.supermicro.com/products/accessories/addon/SIM.cfm)
-
-### nfs0.dfw.rg.net Disk Drives
-```
-for i in 0 1 2 3 4 5 6 7; do tw_cli /c2/p$i show serial; done
-```
-
-| Port | Model | Serial | Size | Date |
-| -------- | ------------------ | --------------- | ---- | ------------------ |
-| p0 | ST4000DM000-1F2168 | Z300L98C | 4TB | don't know |
-| p1 | WD4000F9YZ-09N20L1 | WD-WCC5D1DS4012 | 4TB | 2019.04.07 |
-| p2 | WD60EFRX-68L0BN1 | WD-WX41DA57H7UJ | 6TB | 2018.03.09 |
-| p3 | WD4000F9YZ-09N20L1 | WD-WCC5D2KHHYE8 | 4TB | 2016.06.09 |
-| p4 | ST4000DM000-1F2168 | Z300KBMM | 4TB | don't know |
-| p5 | ST4000DM000-1F2168 | Z300KBQN | 4TB | don't know |
-| p6 | ST4000DM000-1F2168 | Z300L8J5 | 4TB | don't know |
-| p7 | WD4000F9YZ-09N20L1 | WD-WMC5D0D7V0L9 | 4TB | 2015.12.13 |
-| | | | | |
-| p1 | ST4000DM000-1F2168 | Z300FKES | 4TB | removed 2019.04.07 |
-| p2 | ST4000DM000-1F2168 | Z300L9T3 | 4TB | removed 2018.03.09 |
-| incoming | HUS724040ALS640 | PBK4K70X | 4TB | 2015.12.18 |
-
-### Physical Drive layout
-
-| | | | |
-| ---- | ---- | ---- | ---- |
-| 4 | 5 | 6 | 7 |
-| 0 | 1 | 2 | 3 |
-
## raid0.dfw.rg.net
[Mobo Supermicro X7SB4/E](https://www.supermicro.com/products/motherboard/Xeon3000/3210/X7SB4.cfm) [IPMI AOC-IPMI20-E](http://www.supermicro.com/products/accessories/addon/AOC-IPMI20-E.cfm)
@@ -259,6 +233,39 @@ logical drive labels
| label/disk02 | ada2s1 |
| label/disk03 | ada3s1 |
+## DEAD nfs0.dfw.rg.net
+
+### MoBo
+* [PDSME+](http://www.supermicro.com/products/motherboard/Xeon3000/3010/PDSME_.cfm)
+* [AOC-SIM1U+ IPMI Card](http://www.supermicro.com/products/accessories/addon/SIM.cfm)
+
+### DEAD nfs0.dfw.rg.net Disk Drives
+```
+for i in 0 1 2 3 4 5 6 7; do tw_cli /c2/p$i show serial; done
+```
+
+| Port | Model | Serial | Size | Date |
+| -------- | ------------------ | --------------- | ---- | ------------------ |
+| p0 | ST4000DM000-1F2168 | Z300L98C | 4TB | don't know |
+| p1 | WD4000F9YZ-09N20L1 | WD-WCC5D1DS4012 | 4TB | 2019.04.07 |
+| p2 | WD60EFRX-68L0BN1 | WD-WX41DA57H7UJ | 6TB | 2018.03.09 |
+| p3 | WD4000F9YZ-09N20L1 | WD-WCC5D2KHHYE8 | 4TB | 2016.06.09 |
+| p4 | ST4000DM000-1F2168 | Z300KBMM | 4TB | don't know |
+| p5 | ST4000DM000-1F2168 | Z300KBQN | 4TB | don't know |
+| p6 | ST4000DM000-1F2168 | Z300L8J5 | 4TB | don't know |
+| p7 | WD4000F9YZ-09N20L1 | WD-WMC5D0D7V0L9 | 4TB | 2015.12.13 |
+| | | | | |
+| p1 | ST4000DM000-1F2168 | Z300FKES | 4TB | removed 2019.04.07 |
+| p2 | ST4000DM000-1F2168 | Z300L9T3 | 4TB | removed 2018.03.09 |
+| incoming | HUS724040ALS640 | PBK4K70X | 4TB | 2015.12.18 |
+
+### Physical Drive layout
+
+| | | | |
+| ---- | ---- | ---- | ---- |
+| 4 | 5 | 6 | 7 |
+| 0 | 1 | 2 | 3 |
+
## Disgusting Details
```