From a78ee24fe740cc23721c1a5dd4790298269357f7 Mon Sep 17 00:00:00 2001 From: Romain GARBAGE <romain.garbage@inria.fr> Date: Thu, 28 Nov 2024 13:46:58 +0100 Subject: [PATCH] Add new machine guix-hpc8. * build-node.scm, head-node.scm: Add key file entry for guix-hpc8. * deploy.scm: Add entry for guix-hpc8. * guix-hpc8.scm, guix/keys/guix-hpc8.pub: New files. --- build-node.scm | 3 ++- deploy.scm | 11 ++++++++++- guix-hpc8.scm | 44 +++++++++++++++++++++++++++++++++++++++++ guix/keys/guix-hpc8.pub | 6 ++++++ head-node.scm | 3 ++- 5 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 guix-hpc8.scm create mode 100644 guix/keys/guix-hpc8.pub diff --git a/build-node.scm b/build-node.scm index 3641c4a..ecb9224 100644 --- a/build-node.scm +++ b/build-node.scm @@ -28,7 +28,8 @@ (local-file "guix/keys/guix-hpc4.pub") (local-file "guix/keys/guix-hpc5.pub") (local-file "guix/keys/guix-hpc6.pub") - (local-file "guix/keys/guix-hpc7.pub")) + (local-file "guix/keys/guix-hpc7.pub") + (local-file "guix/keys/guix-hpc8.pub")) (guix-configuration-authorized-keys config))) (build-accounts 40) diff --git a/deploy.scm b/deploy.scm index 228834d..756d458 100644 --- a/deploy.scm +++ b/deploy.scm @@ -69,4 +69,13 @@ (system "x86_64-linux") (host-name "guix-hpc7") (host-key - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOyhK3PjJ1aKtkOHoBUke0dqKAtBbh1rqAh9W7W0qLRp root@(none)"))))) + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOyhK3PjJ1aKtkOHoBUke0dqKAtBbh1rqAh9W7W0qLRp root@(none)")))) + + (machine + (operating-system (load-operating-system "guix-hpc8.scm")) + (environment managed-host-environment-type) + (configuration (machine-ssh-configuration + (system "x86_64-linux") + (host-name "guix-hpc8") + (host-key + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIES0cHOOh1xBXj/Yi2DNVju1k12utBal5Ut3hBAHUu6R root@(none)"))))) diff --git a/guix-hpc8.scm b/guix-hpc8.scm new file mode 100644 index 0000000..61498c1 --- /dev/null +++ b/guix-hpc8.scm @@ -0,0 +1,44 @@ +;;; Configuration of the guix-hpc8 build node. + +(use-modules (gnu)) + +(let ((base-os (load "build-node.scm"))) + (operating-system + (inherit base-os) + (host-name "guix-hpc8") + + ;; This is a UEFI setup. + (bootloader (bootloader-configuration + (bootloader grub-efi-bootloader) + (targets (list "/boot/efi")))) + + (initrd-modules (append (list "megaraid_sas") + %base-initrd-modules)) + + (file-systems (append (list (file-system + (mount-point "/boot/efi") + (device (uuid "B65C-D597" 'fat32)) + (type "vfat")) + (file-system + (mount-point "/") + (device (uuid "af2de248-a752-4a49-b391-fb471fe913f6" + 'ext4)) + (type "ext4"))) + %base-file-systems)) + + (swap-devices (list (swap-space + (target (uuid "278cd11b-7ff2-4b75-9138-03dcd69a911c"))))) + + (services + ;; Configure networking. + (cons (service static-networking-service-type + (list (static-networking + (addresses (list (network-address + (device "ens10f0") + (value "194.199.1.118/26")))) + (routes (list (network-route + (destination "default") + (gateway "194.199.1.64")))) + (name-servers '("193.50.111.150"))))) + + (operating-system-user-services base-os))))) diff --git a/guix/keys/guix-hpc8.pub b/guix/keys/guix-hpc8.pub new file mode 100644 index 0000000..6ce0e53 --- /dev/null +++ b/guix/keys/guix-hpc8.pub @@ -0,0 +1,6 @@ +(public-key + (ecc + (curve Ed25519) + (q #CEB9EF58FFFF96286219C706519CF0A4F8C424B94EB04F70AF5C13182A120E2A#) + ) + ) \ No newline at end of file diff --git a/head-node.scm b/head-node.scm index ef791be..c755821 100644 --- a/head-node.scm +++ b/head-node.scm @@ -49,7 +49,8 @@ export CUIRASS_LOGGING_LEVEL=${CUIRASS_LOGGING_LEVEL:-debug}\n" (local-file "guix/keys/guix-hpc4.pub") (local-file "guix/keys/guix-hpc5.pub") (local-file "guix/keys/guix-hpc6.pub") - (local-file "guix/keys/guix-hpc7.pub")) + (local-file "guix/keys/guix-hpc7.pub") + (local-file "guix/keys/guix-hpc8.pub")) (guix-configuration-authorized-keys config))) (build-accounts 60) -- GitLab