From 432ce4c3dd5016735367757384dcc54a788f7b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laurent=20P=C3=A9tr=C3=A9?= <laurent.petre@cern.ch>
Date: Tue, 28 Nov 2023 19:35:10 +0100
Subject: [PATCH] Update P5 machines list after migration to AlmaLinux 9

Note that some machines have been move to the new VM infrastructure.
Also note that some machines, not controlled by GEM, have been updated
to match the actual state of the system.
---
 docs/expert/infrastructure/p5.md              | 57 +++++++++++--------
 .../p5-operations/installation-maintenance.md |  2 +-
 2 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/docs/expert/infrastructure/p5.md b/docs/expert/infrastructure/p5.md
index b70b492..b82df87 100644
--- a/docs/expert/infrastructure/p5.md
+++ b/docs/expert/infrastructure/p5.md
@@ -15,29 +15,35 @@ To open a ticket you must be a member of the appropriate e-group and then use th
 
 ## Computers
 
-GEM machines:
-
-| Hostname                | Machine alias   | Notes                                    |
-|-------------------------|-----------------|------------------------------------------|
-| `srv-s2g18-33-01`       | `gem-daq01`     | Data taking applications, PowerEdge R340 |
-| `srv-s2g18-31-01`       | `gem-daq02`     | DAQ services, PowerEdge R340             |
-| `srv-s2g18-34-01`       | `gem-locdaq01`  | Local readout, PowerEdge R440            |
-| `srv-s2g18-32-01`       | `gem-locdaq02`  | Analysis suite, PowerEdge R440           |
-| `kvm-s3562-1-ip151-107` | `gemvm-control` | GEM DAQ head node, VM                    |
-| `kvm-s3562-1-ip151-74`  | `gemvm-test`    | Test machine[^1], VM                    |
-
-[^1]: Typically unmanaged services, such as the GE2/1 detector safety system
+Machines controlled by GEM:
+
+| Hostname                | Machine alias   | OS            | Notes                                    |
+|-------------------------|-----------------|---------------|------------------------------------------|
+| `srv-s2g18-33-01`       | `gem-daq01`     | AlmaLinux 9.2 | Data taking applications, PowerEdge R340 |
+| `srv-s2g18-31-01`       | `gem-daq02`     | AlmaLinux 9.2 | DAQ services, PowerEdge R340             |
+| `srv-s2g18-34-01`       | `gem-locdaq01`  | AlmaLinux 9.2 | Local readout, PowerEdge R440            |
+| `srv-s2g18-32-01`       | `gem-locdaq02`  | AlmaLinux 9.2 | Analysis suite, PowerEdge R440           |
+| `kvm-s3562-1-ip156-65`  | `gemvm-control` | AlmaLinux 9.2 | GEM DAQ head node, VM                    |
+| `kvm-s3562-1-ip157-30`  | `gemvm-test`    | AlmaLinux 9.2 | Test/development machine[^1], VM         |
+
+[^1]: Typically for unmanaged services (e.g. the GE2/1 detector safety system)
+    or development purposes. While the machine is managed via Puppet, tools and
+    libraries are manually installed whenever needed (`gcc`, `java`, `git`,...)
+    Do not rely on system persistence! The GEM Dropbox is also disabled on that
+    specific machine, so that no GEM RPM packages are available and
+    automatically installed.
 
 Machines used by GEM:
 
-| Hostname                | Machine alias               | Notes                                     |
-|-------------------------|-----------------------------|-------------------------------------------|
-| `ctrl-s2c17-22-01`      | `ctrlhub-gem-01`[^2]        | `sysmgr` and `control_hub` host           |
-| `kvm-s3562-1-ip151-110` | `cmsrc-gem`, `gemrc-gemdev` | `RCMS` host (i.e., function managers)     |
-| `bu-c2f13-16-01`        |                             | DAQ2 BU (access to the Lustre filesystem) |
-| `fu-c2f11-23-03`        |                             | MiniDAQ DQM                               |
+| Hostname                | Machine alias               | OS         | Notes                                             |
+|-------------------------|-----------------------------|------------|---------------------------------------------------|
+| `ctrl-s2c17-22-01`      | `ctrlhub-gem-01`[^2]        | CentOS 7.6 | `sysmgr` and `control_hub` host                   |
+| `kvm-s3562-1-ip156-16`  | `cmsrc-gem`, `gemrc-gemdev` | CentOS 7.9 | `RCMS` host (i.e., function managers)             |
+| `fu-c2f11-23-03`        |                             | CentOS 7.9 | DAQ2 MiniDAQ DQM                                  |
+| `dqmfu-c2b03-46-01`     |                             | RedHat 8.7 | DAQ3 MiniDAQ DQM (shared between Muon subsystems) |
 
-[^2]: Additional aliases: `bridge-s2e01-04`, `bridge-s2e01-14`, `bridge-s2e01-23`
+[^2]: Additional µTCA-based aliases: `bridge-s2e01-04`, `bridge-s2e01-14`,
+    `bridge-s2e01-23`
 
 ### Remote powering
 
@@ -48,11 +54,16 @@ Instructions on remotely powering on/off the centrally managed GEM machines can
 
 ### Software dropbox
 
-Information on using the `dropbox2` tool to update the software
-associated with the puppetized machines can be found on the P5 cluster
-users guide twiki [dropbox
+Information on using the `dropbox2` tool to update the software associated with
+the puppetized machines can be found on the P5 cluster users guide twiki
+[dropbox
 link](https://twiki.cern.ch/twiki/bin/view/CMS/ClusterUsersGuide#How_to_use_the_dropbox_computer).
 
+!!! note
+    For machines installed with CentOS 7.x, the `cmsdropbox` machine must be
+    used while for machines installed with AlmaLinux 9.x, the `cmsdropboxel9`
+    machine must be used. In both cases, the `dropbox2` script must be used.
+
 !!! note
     If a package has not previously been included in a GEM puppet profile, a
     [Jira ticket](https://its.cern.ch/jira/projects/CMSONS) should be
@@ -78,7 +89,7 @@ The notification polices can be changed by opening a [Jira ticket](https://its.c
 | `mch-s2e01-23-01` | GE-1/1 µTCA crate - FED1467 (GEM-)                 |
 | `mch-s2e01-14-01` | GE+1/1 µTCA crate - FED1468 (GEM+)                 |
 | `psu-s2e01-05-01` | GE2/1 Aspiro PSU                                   |
-| `mch-s2e01-04-01` | GE2/1 demonstrator µTCA crate - FED1469 (GEMPILOT) |
+| `mch-s2e01-04-01` | GE2/1 µTCA crate - FED1469 (GEMPILOT) |
 
 #### S2E02
 
diff --git a/docs/expert/p5-operations/installation-maintenance.md b/docs/expert/p5-operations/installation-maintenance.md
index 8710cc6..eab7402 100644
--- a/docs/expert/p5-operations/installation-maintenance.md
+++ b/docs/expert/p5-operations/installation-maintenance.md
@@ -33,7 +33,7 @@ Failing to follow the instructions or failing to react to unexpected events can
 Updates can be installed with RPMs through the centrally provided `dropbox2` mechanism:
 
 ``` sh
-# from cmsdropbox
+# from cmsdropbox or cmsdropboxel9
 sudo dropbox2 -s gem -u <path-to-the-rpm-folder>
 ```
 
-- 
GitLab