From e7cfaf03135311d8b8a122526ca5e0bbabc9fb67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laurent=20P=C3=A9tr=C3=A9?= <laurent.petre@cern.ch>
Date: Tue, 1 Feb 2022 17:06:37 +0100
Subject: [PATCH] Remove non-existing machines from the b904 setups

---
 docs/expert/infrastructure/904.md | 351 ++----------------------------
 1 file changed, 23 insertions(+), 328 deletions(-)

diff --git a/docs/expert/infrastructure/904.md b/docs/expert/infrastructure/904.md
index cd42c8f..827cb93 100644
--- a/docs/expert/infrastructure/904.md
+++ b/docs/expert/infrastructure/904.md
@@ -1,352 +1,49 @@
 # Infrastructure at 904
 
-The GEM presence in building 904 on the CERN Prevessin site is broken
-into three primary areas.
-
 ## Computers
 
-+---------------+-------------+-------------+------------------------+
-| GEM machine   | Location    | Interfaces  | Notes                  |
-| alias         |             |             |                        |
-+===============+=============+=============+========================+
-| `gem904daq01` | Integration | -   GPN:    | -   CC7,               |
-|               | rack E16    |     `eno1`  |     `cont              |
-|               |             | -   µTCA:   | rol_hub`/RCMS/`sysmgr` |
-|               |             |             |     host               |
-|               |             |    `en2ps0` | -   µTCA local netowrk |
-|               |             | -           |     via `macvlan`      |
-|               |             |    µFEDKIT: | -   TTL tower PC       |
-+---------------+-------------+-------------+------------------------+
-| `gem904daq02` | Cubicle     | -   GPN:    | -   CC7, connected to  |
-|               |             |     `eno1`  |     NAS on local       |
-|               |             | -   Local:  |     network            |
-+---------------+-------------+-------------+------------------------+
-| `gem904daq03` | Cubicle     | -   GPN:    | -   SLC6, connected to |
-|               |             |     `em1`   |     NAS on local       |
-|               |             | -   Local:  |     network            |
-|               |             |     `p3p1`  |                        |
-+---------------+-------------+-------------+------------------------+
-| `gem904daq04` | Integration | -   GPN:    | -   CC7                |
-|               | rack E16    |     `em1`   | -   µTCA local network |
-|               |             | -   µTCA:   |     not `macvlan`      |
-|               |             |     `em2`   | -   Dell 1U blade      |
-|               |             | -           |     server             |
-|               |             |    µFEDKIT: |                        |
-|               |             |     `p2p1`  |                        |
-+---------------+-------------+-------------+------------------------+
-| `gem904nas01` | Cubicle     | -   GPN:    | -   QNAP NAS serving   |
-|               |             | -   Local:  |     files to           |
-|               |             |             |     `/data/bigdisk` on |
-|               |             |             |     all GEM 904        |
-|               |             |             |     machines           |
-+---------------+-------------+-------------+------------------------+
-| `gem904hub`   | Cubicle     | -   GPN:    | -   Zyxel media        |
-|               |             | -   Local:  |     router, network    |
-|               |             |             |     hub for cubicle,   |
-|               |             |             |     WiFi for cubicle   |
-|               |             |             |     (should be         |
-|               |             |             |     disabled)          |
-+---------------+-------------+-------------+------------------------+
-| `             | QC lab,     | -   GPN:    | -   CC7                |
-| gem904qc7daq` | blue rack   |     `em1`   | -   µTCA local network |
-|               |             | -   µTCA:   |     via `macvlan`      |
-|               |             |     `em2`   | -   Dell R630 1U blade |
-|               |             | -           |     server,            |
-|               |             |    µFEDKIT: |                        |
-|               |             |     N/A     |                        |
-+---------------+-------------+-------------+------------------------+
-| `             | QC lab,     | -   GPN:    | -   CC7,               |
-| gem904qc8daq` | blue rack   |     `eno1`  |                        |
-|               |             | -   µTCA:   | `control_hub`/`sysmgr` |
-|               |             |             |     host               |
-|               |             |    `enp6s0` | -   µTCA local network |
-|               |             | -           |     via `macvlan`      |
-|               |             |    µFEDKIT: | -   TTL tower PC       |
-|               |             |             |                        |
-|               |             |    `enp1s0` |                        |
-+---------------+-------------+-------------+------------------------+
-| `             | QC lab,     | -   GPN:    | -   Hosts the QC8      |
-| gem904qc8dqm` | blue rack   |     `eno2`  |     online DQM server. |
-|               |             | -   µTCA:   | -   µTCA is currently  |
-|               |             |     `eno1`  |     badly configured,  |
-|               |             |             |     will collide with  |
-|               |             |             |     `gem904qc8daq`     |
-+---------------+-------------+-------------+------------------------+
-
-=== "Cubicle"
-
-    +-------------------+-----------------+-------------------------------+
-    | GEM machine alias | Interfaces      | Notes                         |
-    +===================+=================+===============================+
-    | `gem904daq02`     | -   GPN: `eno1` | -   CC7, connected to NAS on  |
-    |                   | -   Local:      |     local network             |
-    +-------------------+-----------------+-------------------------------+
-    | `gem904daq03`     | -   GPN: `em1`  | -   SLC6, connected to NAS on |
-    |                   | -   Local:      |     local network             |
-    |                   |     `p3p1`      |                               |
-    +-------------------+-----------------+-------------------------------+
-    | `gem904nas01`     | -   GPN:        | -   QNAP NAS serving files to |
-    |                   | -   Local:      |     `/data/bigdisk` on all    |
-    |                   |                 |     GEM 904 machines          |
-    +-------------------+-----------------+-------------------------------+
-    | `gem904hub`       | -   GPN:        | -   Zyxel media router,       |
-    |                   | -   Local:      |     network hub for cubicle,  |
-    |                   |                 |     WiFi for cubicle (should  |
-    |                   |                 |     be disabled)              |
-    +-------------------+-----------------+-------------------------------+
-
 === "QC lab"
 
-    +-------------------+-----------------+-------------------------------+
-    | GEM machine alias | Interfaces      | Notes                         |
-    +===================+=================+===============================+
-    | `gem904qc7daq`    | -   GPN: `em1`  | -   CC7                       |
-    |                   | -   µTCA: `em2` | -   µTCA local network via    |
-    |                   | -   µFEDKIT:    |     `macvlan`                 |
-    |                   |     N/A         | -   Dell R630 1U blade        |
-    |                   |                 |     server,                   |
-    +-------------------+-----------------+-------------------------------+
-    | `gem904qc8daq`    | -   GPN: `eno1` | -   CC7,                      |
-    |                   | -   µTCA:       |     `control_hub`/`sysmgr`    |
-    |                   |     `enp6s0`    |     host                      |
-    |                   | -   µFEDKIT:    | -   µTCA local network via    |
-    |                   |     `enp1s0`    |     `macvlan`                 |
-    |                   |                 | -   TTL tower PC              |
-    +-------------------+-----------------+-------------------------------+
-    | `gem904qc8dqm`    | -   GPN: `eno2` | -   Hosts the QC8 online DQM  |
-    |                   | -   µTCA:       |     server.                   |
-    |                   |     `eno1`      | -   µTCA is currently badly   |
-    |                   |                 |     configured, will collide  |
-    |                   |                 |     with `gem904qc8daq`       |
-    +-------------------+-----------------+-------------------------------+
+    | GEM machine alias | Interfaces          | Notes                         |
+    |-------------------|---------------------|-------------------------------|
+    | `gem904qc8daq`    | - GPN: `eno1`       | - CC7                         |
+    |                   | - µTCA: `enp6s0`    | - `control_hub`/`sysmgr` host |
+    |                   | - µFEDKIT: `enp1s0` | - TTL tower PC                |
 
 === "Integration rack"
 
-    +-------------------+-----------------+-------------------------------+
-    | GEM machine alias | Interfaces      | Notes                         |
-    +===================+=================+===============================+
-    | `gem904daq01`     | -   GPN: `eno1` | -   CC7,                      |
-    |                   | -   µTCA:       |                               |
-    |                   |     `en2ps0`    |   `control_hub`/RCMS/`sysmgr` |
-    |                   | -   µFEDKIT:    |     host                      |
-    |                   |                 | -   µTCA local netowrk via    |
-    |                   |                 |     `macvlan`                 |
-    |                   |                 | -   TTL tower PC              |
-    +-------------------+-----------------+-------------------------------+
-    | `gem904daq04`     | -   GPN: `em1`  | -   CC7                       |
-    |                   | -   µTCA: `em2` | -   µTCA local network not    |
-    |                   | -   µFEDKIT:    |     `macvlan`                 |
-    |                   |     `p2p1`      | -   Dell 1U blade server      |
-    +-------------------+-----------------+-------------------------------+
-
-=== "DAQ rack"
-
-    Currently GEM does not have any centrally managed infrastructure on the
-    904 technical network.
-    
-    +-------------------+-----------------+-------------------------------+
-    | GEM machine alias | Interfaces      | Notes                         |
-    +===================+=================+===============================+
-    | `tcds-co          | -   PI:         | -   TCDS host for 904 on port |
-    | ntrol-904.cms904` |     `lid=303`   |     `2107`                    |
-    |                   | -   iCI:        |                               |
-    |                   |     `lid=504`   |                               |
-    +-------------------+-----------------+-------------------------------+
-
-## μTCA shelves
-
- --------------------------------------------------------------------------
- GEM μTCA shelf  Location         Notes
- --------------- ---------------- -----------------------------------------
- `gem-shelf01`   Integration      Serves \"coffin\" setup
-                 `E16`            
- 
- `gem-shelf02`   Integration      Serves debug and development setup
-                 `E17`            
- 
- `gem-shelf01`   QC grey rack     Serves QC8 and cosmic stand
- 
- `gem-shelf02`   QC blue rack     Serves QC7
- --------------------------------------------------------------------------
-
-=== "Integration `shelf01`"
-
-    -   rack location: `E16`
-    -   Vadatech VT892
-    
-      ------------------------------------------------------------------------------
-      Slot    S/N         Chambers                     Notes
-      ------- ----------- ---------------------------- -----------------------------
-      MCH                                              Vadatech
-      
-      AMC13   170                                      
-      
-      AMC1                                             
-      
-      AMC2    `eagle48`                                
-      
-      AMC3                                             
-      
-      AMC4                                             
-      
-      AMC5                                             
-      
-      AMC6                                             
-      
-      AMC7                                             
-      
-      AMC8                                             
-      
-      AMC9                                             
-      
-      AMC10                                            
-      
-      AMC11                                            
-      
-      AMC12                                            
-      ------------------------------------------------------------------------------
-  
-=== "Integration `shelf02`"
-
-    -   rack location: `E17`
-    -   Schroff
-    
-      ------------------------------------------------------------------------------
-      Slot    S/N         Chambers                     Notes
-      ------- ----------- ---------------------------- -----------------------------
-      MCH     9628                                     NAT
-      
-      AMC13   204                                      
-      
-      AMC1                                             
-      
-      AMC2                                             
-      
-      AMC3                                             
-      
-      AMC4                                             
-      
-      AMC5                                             
-      
-      AMC6                                             
-      
-      AMC7    `eagle64`                                
-      
-      AMC8                                             
-      
-      AMC9                                             
-      
-      AMC10                                            
-      
-      AMC11                                            
-      
-      AMC12                                            
-      ------------------------------------------------------------------------------
-
-=== "QC lab `shelf01`"
-
-    -   rack location: QC lab grey rack
-    -   Vadatech VT892
+    | GEM machine alias | Interfaces        | Notes                              |
+    |-------------------|-------------------|------------------------------------|
+    | `gem904daq01`     | - GPN: `eno1`     | - CC7                              |
+    |                   | - µTCA: `en2ps0`  | - `control_hub`/RCMS/`sysmgr` host |
+    |                   |                   | - TTL tower PC                     |
+    |-------------------|-------------------|------------------------------------|
+    | `gem904daq04`     | - GPN: `em1`      | - CC7                              |
+    |                   | - µTCA: `em2`     | - Dell 1U blade server             |
+    |                   | - µFEDKIT: `p2p1` |                                    |
     
-      ------------------------------------------------------------------------------
-      Slot    S/N         Chambers                     Notes
-      ------- ----------- ---------------------------- -----------------------------
-      MCH     8338                                     NAT
-      
-      AMC13   203                                      
-      
-      AMC1                                             
-      
-      AMC2    `eagle26`                                
-      
-      AMC3                                             
-      
-      AMC4    `eagle35`                                
-      
-      AMC5                                             
-      
-      AMC6    `eagle23`                                
-      
-      AMC7                                             
-      
-      AMC8                                             
-      
-      AMC9                                             
-      
-      AMC10                                            
-      
-      AMC11                                            
-      
-      AMC12                                            
-      ------------------------------------------------------------------------------
-
-=== "QC lab `shelf02`"
-
-    -   rack location: QC lab blue rack
-    -   Schroff
-    
-      --------------------------------------------------------------------------
-      Slot    S/N     Chambers                     Notes
-      ------- ------- ---------------------------- -----------------------------
-      MCH                                          NAT
-      
-      AMC13                                        
-      
-      AMC1                                         
-      
-      AMC2                                         
-      
-      AMC3    GLIB XX                              
-      
-      AMC4                                         
-      
-      AMC5                                         
-      
-      AMC6                                         
-      
-      AMC7                                         
-      
-      AMC8                                         
-      
-      AMC9                                         
-      
-      AMC10                                        
-      
-      AMC11   GLIB XX                              
-      
-      AMC12                                        
-      --------------------------------------------------------------------------
-
 ## The 904 NAS (gem904nas01)
 
-In the GEM cubicle in 904 (904-R-U18) there is a network attached
-storage (NAS) unit with 4 slots configured as RAID10.
+In the GEM QC lab in 904 there is a network attached storage (NAS) unit with 4 slots configured as RAID10.
 
 !!! important
-    Currently there are 2TB HDDs installed, resulting in a storage capacity
-    of 4TB, but 4 4TB disks were purchased as an upgrade. Neither the disk
-    instllation, nor the RAID rebuild has yet been done.
+    Currently there are 2TB HDDs installed, resulting in a storage capacity of 4TB, but 4 4TB disks were purchased as an upgrade.
+    Neither the disk instllation, nor the RAID rebuild has yet been done.
 
 The NAS serves several purposes:
 
 -   Host local RSDB for RCMS in the lab
--   Provide central storage certain software packages, e.g., Xilinx
-    tooling
+-   Provide central storage certain software packages, e.g., Xilinx tooling
 -   Provide central storage for lab data
 -   Provide central user storage
 -   Provide local YUM repository (obsolete with EOS repo)
 
-The NAS is auto-mounted on all the managed machines in the 904 labs via
-the `autofs` service. To set this up on a new machine, you should use
-the
-:cpp`setupMachine.sh script<gemctp7user:setup_machine>`{.interpreted-text
-role="func"}. Manual instructions (following the steps executd in the
-script) are provided below.
+The NAS is auto-mounted on all the managed machines in the 904 labs via the `autofs` service.
+Manual instructions how to set this up on a new machine are provided below.
 
 ### Connecting to the NAS
 
-On the machine you are setting up to connect to the NAS, you should
-cheeck that the `autofs` service is running (for `systemd` systems)
+On the machine you are setting up to connect to the NAS, you should check that the `autofs` service is running (for `systemd` systems)
 
 ``` sh
 systemctl status autofs
@@ -362,8 +59,7 @@ CGroup: /system.slice/autofs.service
         └─2547 /usr/sbin/automount --systemd-service --dont-check-daemon
 ```
 
-If you do not see that the `autofs` service is either running or
-available, you may have to install it.
+If you do not see that the `autofs` service is either running or available, you may have to install it.
 
 ``` sh
 yum install autofs
@@ -383,8 +79,7 @@ EOF
 echo '/data/bigdisk   /etc/auto.nas  --timeout=600 --ghost --verbose' > /etc/auto.master
 ```
 
-This will result in the 4 NAS mounts being mounted on the local machine
-at `/data/bigdis/<mount point>`.
+This will result in the 4 NAS mounts being mounted on the local machine at `/data/bigdis/<mount point>`.
 
 !!! warning
     The NAS hostname `gem904nas01.cern.ch` must be resolvable from the
-- 
GitLab