Infra: Decommission 3n-hsw - pxe/ansible

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: Ie3ddec5487192217d0921f892098384da73a1ef2

3 files changed, 21 insertions, 27 deletions

diff --git a/docs/lab/fdio-dc-inventory-vexxhost.md b/docs/lab/fdio-dc-inventory-vexxhost.md
index 96990881e1..c648b4a33e 100644
--- a/docs/lab/fdio-dc-inventory-vexxhost.md
+++ b/docs/lab/fdio-dc-inventory-vexxhost.md
@@ -79,10 +79,10 @@ s56-t37-sut1,up,t37,2n-tx2,ThunderX2-9980,N/A,10.30.51.71,10.30.50.71,3016.11,u4
 s41-nomad,up,nomad-cluster1,nomad-client,UCSC-C240-M4SX,FCH1950V1FQ,10.30.51.28,10.30.50.28,3016.11,u39-u40
 s40-nomad,up,nomad-cluster1,nomad-server,UCSC-C240-M4SX,FCH2013V0HZ,10.30.51.30,10.30.50.30,3016.11,u37-u38
 s39-nomad,up,nomad-cluster1,nomad-client,UCSC-C240-M4SX,FCH2013V0J2,10.30.51.29,10.30.50.29,3016.11,u35-u36
-s42-nomad,up,nomad-cluster1,nomad-server,UCSC-C240-M4SX,FCH1950V1FN,10.30.51.32,10.30.50.32,3016.11,u19-u20
-s43-nomad,up,nomad-cluster1,nomad-server,UCSC-C240-M4SX,FCH1950V1H5,10.30.51.33,10.30.50.33,3016.11,u17-u18
-s44-nomad,up,nomad-cluster1,nomad-client,UCSC-C240-M4SX,FCH1950V1FS,10.30.51.34,10.30.50.34,3016.11,u15-u16
-s45-nomad,up,nomad-cluster1,nomad-client,UCSC-C240-M4SX,FCH1950V1FL,10.30.51.35,10.30.50.35,3016.11,u13-u14
+s42-nomad,up,nomad-cluster1,nomad-server,UCSC-C240-M4SX,FCH1950V1FN,10.30.51.22,10.30.50.22,3016.11,u19-u20
+s43-nomad,up,nomad-cluster1,nomad-server,UCSC-C240-M4SX,FCH1950V1H5,10.30.51.24,10.30.50.24,3016.11,u17-u18
+s44-nomad,up,nomad-cluster1,nomad-client,UCSC-C240-M4SX,FCH1950V1FS,10.30.51.25,10.30.50.25,3016.11,u15-u16
+s45-nomad,up,nomad-cluster1,nomad-client,UCSC-C240-M4SX,FCH1950V1FL,10.30.51.26,10.30.50.26,3016.11,u13-u14
 s55-t36-sut1,up,t36,1n-tx2,ThunderX2-9980,N/A,10.30.51.70,10.30.50.70,3016.11,u11-u12
 s52-nomad,up,nomad-cluster1,nomad-client,ThunderX-88XX,N/A,10.30.51.65,10.30.50.65,3016.11,u9-u10
 s51-nomad,up,nomad-cluster1,nomad-client,ThunderX-88XX,N/A,10.30.51.66,10.30.50.66,3016.11,u9-u10
@@ -109,11 +109,6 @@ s36-t28-tg1,up,t28,2n-clx,SYS-7049GP-TRT,C7470KH37A30511,10.32.8.21,10.30.55.21,
 s37-t29-sut1,up,t29,2n-clx,SYS-7049GP-TRT,C7470KH37A30566,10.32.8.22,10.30.55.22,3016.12,u5-u8
 s38-t29-tg1,up,t29,2n-clx,SYS-7049GP-TRT,C7470KH37A30506,10.32.8.23,10.30.55.23,3016.12,u1-u4
 
-
-Todos:
-
-- Rename: s55-t36-sut1 -> s55-t14-sut1  // ubuntu2004 refresh
-
 Notes:
 
 - softiron-1, softiron-2, softiron-3, decommission request and instructions issued
diff --git a/docs/lab/fdio-dc-physical.yaml b/docs/lab/fdio-dc-physical.yaml
index fc059fdcf8..ca8978e552 100644
--- a/docs/lab/fdio-dc-physical.yaml
+++ b/docs/lab/fdio-dc-physical.yaml
@@ -267,29 +267,29 @@ yul1:
         oper_status: production
         device_type: UCSC-C240-M4S
         serial_number: FCH1950V1FN
-        mgmt_ip4: 10.30.51.32
-        lom_ip4: 10.30.50.32
+        mgmt_ip4: 10.30.51.22
+        lom_ip4: 10.30.50.22
       - unit: 17..18
         name: s43-nomad
         oper_status: production
         device_type: UCSC-C240-M4S
         serial_number: FCH1950V1H5
-        mgmt_ip4: 10.30.51.33
-        lom_ip4: 10.30.50.33
+        mgmt_ip4: 10.30.51.24
+        lom_ip4: 10.30.50.24
       - unit: 15..16
         name: s44-nomad
         oper_status: production
         device_type: UCSC-C240-M4S
         serial_number: FCH1950V1FS
-        mgmt_ip4: 10.30.51.34
-        lom_ip4: 10.30.50.34
+        mgmt_ip4: 10.30.51.25
+        lom_ip4: 10.30.50.25
       - unit: 13..14
         name: s45-nomad
         oper_status: production
         device_type: UCSC-C240-M4S
         serial_number: FCH1950V1FL
-        mgmt_ip4: 10.30.51.35
-        lom_ip4: 10.30.50.35
+        mgmt_ip4: 10.30.51.26
+        lom_ip4: 10.30.50.26
       - unit: 11..12
         name: s55-t36-sut1
         oper_status: production
diff --git a/docs/lab/testbed_specifications.md b/docs/lab/testbed_specifications.md
index 365eaddb59..b728370064 100644
--- a/docs/lab/testbed_specifications.md
+++ b/docs/lab/testbed_specifications.md
@@ -47,7 +47,6 @@
       1. [2-Node-Cascadelake Wiring (2n-clx) PROD](#2-node-cascadelake-wiring-2n-clx-prod)
       1. [2-Node-Zen2 Wiring (2n-zn2) PROD](#2-node-zen2-wiring-2n-zn2-prod])
       1. [2-Node-ThunderX2 Wiring (2n-tx2) PROD](#2-node-thunderx2-wiring-2n-tx2-prod)
-      1. [3-Node-Haswell Wiring (3n-hsw) PROD](#3-node-haswell-wiring-3n-hsw-prod)
       1. [3-Node-Skylake Wiring (3n-skx) PROD](#3-node-skylake-wiring-3n-skx-prod)
       1. [3-Node-Rangeley Wiring (3n-rng) TODO](#3-node-rangeley-wiring-3n-rng-todo)
       1. [3-Node-Taishan Wiring (3n-tsh) PROD](#3-node-taishan-wiring-3n-tsh-prod)
@@ -70,7 +69,7 @@ hosted by LFN FD.io CSIT project.
 
 ```
  #. CSIT_tb          Purpose  SUT   TG    #TB  #SUT #TG  #hsw #skx #ps1 #rng #dnv #tx2 #tsh #clx #zn2
- 1. 1-Node-Haswell     nomad  hsw   ---   4    4    0    4    0    0    0    0    0    0    0    0
+ 1. 1-Node-Haswell     nomad  hsw   na    4    4    0    4    0    0    0    0    0    0    0    0
  2. 1-Node-Skylake     dev    skx   na    2    2    0    0    2    0    0    0    0    0    0    0
  3. 1-Node-ThunderX2   perf   tx2   na    1    1    .5   0    .5   0    0    0    1    0    0    0
  4. 1-Node-ThunderX2   dev    tx2   na    2    2    0    0    0    0    0    0    2    0    0    0
@@ -233,16 +232,16 @@ Name         | Comment
 10.30.50.13  | LF Reserved
 10.30.50.14  | LF Reserved
 10.30.50.15  | LF Reserved
+10.30.50.22  | s42-nomad
+10.30.50.24  | s43-nomad
+10.30.50.25  | s44-nomad
+10.30.50.26  | s45-nomad
 10.30.50.28  | s41-nomad
 10.30.50.29  | s39-nomad
 10.30.51.29  | s22-t35-sut1 screen -r /dev/ttyusb0
 10.30.50.30  | s40-nomad
 10.30.51.30  | s23-t35-sut2 screen -r /dev/ttyusb1
 10.30.51.30  | s24-t35-sut3 screen -r /dev/ttyusb2
-10.30.50.32  | s42-nomad
-10.30.50.33  | s43-nomad
-10.30.50.34  | s44-nomad
-10.30.50.35  | s45-nomad
 10.30.50.36  | s17-t33-sut1
 10.30.50.37  | s18-t33-sut2
 10.30.50.38  | fdio-marvell-dev
@@ -311,13 +310,13 @@ Name                      | Comment
 10.30.51.7                | LF Reserved
 10.30.51.8                | LF Reserved
 10.30.51.15               | LF Reserved
+10.30.51.22               | s42-nomad
+10.30.51.24               | s43-nomad
+10.30.51.25               | s44-nomad
+10.30.51.26               | s45-nomad
 10.30.51.28               | s41-nomad
 10.30.51.29               | s39-nomad
 10.30.51.30               | s40-nomad
-10.30.51.32               | s42-nomad
-10.30.51.33               | s43-nomad
-10.30.51.34               | s44-nomad
-10.30.51.35               | s45-nomad
 10.30.51.36               | s17-t33-sut1
 10.30.51.37               | s18-t33-sut2
 10.30.51.38               | fdio-marvell-dev