branch master updated: hydra: berlin: Fix static networking service.

[Mathieu Othacehe]

This is an automated email from the git hooks/post-receive script.

mothacehe pushed a commit to branch master
in repository maintenance.

The following commit(s) were added to refs/heads/master by this push:
     new ffb5e62  hydra: berlin: Fix static networking service.
ffb5e62 is described below

commit ffb5e6278488e360aaf9680f79044243d1842860
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Wed Dec 15 14:53:46 2021 +0100

    hydra: berlin: Fix static networking service.
    
    Fix the following error:
    
    service networking provided more that once
    
    by using a single static-networking record for both interfaces.
    
    * hydra/berlin.scm: Fix the static networking service.
---
 hydra/berlin.scm | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/hydra/berlin.scm b/hydra/berlin.scm
index 0ba93b4..011088c 100644
--- a/hydra/berlin.scm
+++ b/hydra/berlin.scm
@@ -219,16 +219,23 @@ Happy hacking!\n"))
                              activation-service-type
                              %copy-kernel-and-initrd)
 
-             ;; Connection to the DMZ for public access
-             ;; This is a 10G port.
-             (static-networking-service "eno2"
-                                        "141.80.181.40"
-                                        #:netmask "255.255.255.0"
-                                        #:gateway "141.80.181.1")
-             ;; Connection to build nodes
-             (static-networking-service "eno1"
-                                        "141.80.167.131"
-                                        #:netmask "255.255.255.192")
+             (service static-networking-service-type
+                      (list (static-networking
+                             (addresses
+                              (list
+                               ;; Connection to the DMZ for public access
+                               ;; This is a 10G port.
+                               (network-address
+                                (device "eno2")
+                                (value "141.80.181.40/24"))
+                               ;; Connection to build nodes
+                               (network-address
+                                (device "eno1")
+                                (value "141.80.167.131/26"))))
+                             (routes
+                              (list (network-route
+                                     (destination "default")
+                                     (gateway "141.80.181.1")))))))
 
              ;; Allow login over serial console.
              (agetty-service (agetty-configuration