guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/02: berlin: Migrate boot device to HDD RAID 1 array.


From: Maxim Cournoyer
Subject: 01/02: berlin: Migrate boot device to HDD RAID 1 array.
Date: Sat, 19 Nov 2022 14:41:22 -0500 (EST)

apteryx pushed a commit to branch master
in repository maintenance.

commit c84511f0394f2e0f1a0736d3f6f1e5bdef49c49b
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Nov 19 13:56:37 2022 -0500

    berlin: Migrate boot device to HDD RAID 1 array.
    
    * hydra/berlin.scm (%btrfs-boot-partition): Delete variable.
    (bootloader) [targets]: Remove "/boot/efi2" target.
    (file-systems): Remove the /boot/efi2 file system, add a file system
    for /boot and adjust the UUID of the underlying device of the
    /boot/efi mout point.
    * doc/infra-handbook.org (Specifications): Mention the PERC controller
    and the two hard drives.
    (Boot device): New section.
---
 doc/infra-handbook.org | 11 ++++++++++-
 hydra/berlin.scm       | 23 ++++++-----------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/doc/infra-handbook.org b/doc/infra-handbook.org
index 6ee8a53..c27ab91 100644
--- a/doc/infra-handbook.org
+++ b/doc/infra-handbook.org
@@ -8,6 +8,7 @@ The different machines involved are registered in the
 file:../hydra/machines.rec file.
 
 * Berlin
+
 Berlin is the main machine, which hosts the website
 (https://guix.gnu.org/), the MUMI issue tracker
 (https://issues.guix.gnu.org/), runs the build farm
@@ -23,6 +24,8 @@ Dell PowerEdge R7425 server with the following specifications:
 - 2x AMD EPYC 7451 24-Core processors
 - Storage Area Network (SAN) of 100 TiB
 - SAN connected to two QLogic QLE2692 16G Fibre Channel adapters (qla2xxx)
+- PERC 730p RAID/HBA disk controller with 8 slots
+- 2x 1 TB hard drives in a RAID 1 configuration (attached to the PERC)
 - 188 GiB of memory
 
 The machine can be remotely administered via iDRAC, the Dell server
@@ -33,8 +36,14 @@ a machine intended to become a fallback, known as node 129, 
which is
 deployed from Berlin via the deploy file:
 file:../hydra/deploy-node-129.scm.
 
-** SSH access to Berlin and node 129
+** Boot device
 
+The boot device is made of two 931 GB rotational disks attached to the
+PERC controller card and configured in RAID 1.  It holds the UEFI
+partition as well as another partition for /boot.  It is made
+necessary because the SAN is not visible to GRUB.
+
+** SSH access to Berlin and node 129
 The following ~~/.ssh/config~ snippets can be defined to access the
 Berlin machine:
 
diff --git a/hydra/berlin.scm b/hydra/berlin.scm
index 238034b..2ff16a7 100644
--- a/hydra/berlin.scm
+++ b/hydra/berlin.scm
@@ -212,15 +212,6 @@ devices {
 (define %common-btrfs-options '(("compress" . "zstd")
                                 ("space_cache" . "v2")))
 
-(define %btrfs-boot-partition
-  (file-system
-    (device (uuid "7a2d8741-bc5e-489e-a2b9-197b2adb6efb")) ;/dev/sda3
-    (mount-point "/boot")
-    (type "btrfs")
-    (options (alist->file-system-options
-              (cons '("subvolid" . "5")
-                    %common-btrfs-options)))))
-
 (define %btrfs-pool-san
   (file-system
     (device (uuid %btrfs-san-uuid))
@@ -300,20 +291,18 @@ at MOUNT-POINT."
   ;; Show the GRUB menu on the serial interface.
   (bootloader (bootloader-configuration
                (bootloader grub-efi-bootloader)
-               (targets '("/boot/efi"
-                          "/boot/efi2"))
+               (targets '("/boot/efi"))
                (terminal-inputs '(serial))
                (terminal-outputs '(serial))))
 
   (file-systems (cons*
-                 %btrfs-boot-partition
                  (file-system
-                  (mount-point "/boot/efi")
-                  (device (uuid "82BD-8C0E" 'fat)) ;/dev/sda2
-                  (type "vfat"))
+                   (mount-point "/boot")
+                   (device (uuid "67498a2f-3e32-4e8c-96a5-8a4844ea229c")) 
;/dev/sdg3
+                   (type "ext4"))
                  (file-system
-                  (mount-point "/boot/efi2")
-                  (device (uuid "AC37-DE29" 'fat)) ;/dev/sdb2
+                  (mount-point "/boot/efi")
+                  (device (uuid "43AE-6859" 'fat)) ;/dev/sdg2
                   (type "vfat"))
                  %btrfs-pool-san        ;for convenience
                  (btrfs-subvolume-mount %btrfs-san-uuid "@root" "/")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]