From 00b94b5e58cbe18c9941e340648fea32f87c6b7f Mon Sep 17 00:00:00 2001 From: PARISOT Clement <clement.parisot@inria.fr> Date: Wed, 5 Mar 2025 17:28:52 +0100 Subject: [PATCH 1/2] [grenoble] servers - add missing MAC --- data/grid5000/sites/grenoble/servers/digsed.json | 3 ++- data/grid5000/sites/grenoble/servers/digwatt.json | 3 ++- input/grid5000/sites/grenoble/servers/physical.yaml | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/data/grid5000/sites/grenoble/servers/digsed.json b/data/grid5000/sites/grenoble/servers/digsed.json index eb05ecb0009..88852064e9c 100644 --- a/data/grid5000/sites/grenoble/servers/digsed.json +++ b/data/grid5000/sites/grenoble/servers/digsed.json @@ -11,7 +11,8 @@ "ip": "172.17.30.4" }, "default": { - "ip": "172.16.31.4" + "ip": "172.16.31.4", + "mac": "EC:F4:BB:CF:C2:98" } }, "redfish": true, diff --git a/data/grid5000/sites/grenoble/servers/digwatt.json b/data/grid5000/sites/grenoble/servers/digwatt.json index df5a4dfbf0f..afc81fa8c32 100644 --- a/data/grid5000/sites/grenoble/servers/digwatt.json +++ b/data/grid5000/sites/grenoble/servers/digwatt.json @@ -11,7 +11,8 @@ "ip": "172.17.30.9" }, "default": { - "ip": "172.16.31.9" + "ip": "172.16.31.9", + "mac": "F8:F2:1E:23:EF:20" } }, "redfish": true, diff --git a/input/grid5000/sites/grenoble/servers/physical.yaml b/input/grid5000/sites/grenoble/servers/physical.yaml index b237cf88c8f..2bc53dc78b7 100644 --- a/input/grid5000/sites/grenoble/servers/physical.yaml +++ b/input/grid5000/sites/grenoble/servers/physical.yaml @@ -7,6 +7,7 @@ digsed: network_adapters: default: ip: 172.16.31.4 + mac: EC:F4:BB:CF:C2:98 adm: ip: 172.17.31.4 bmc: @@ -50,6 +51,7 @@ digwatt: network_adapters: default: ip: 172.16.31.9 + mac: F8:F2:1E:23:EF:20 bmc: ip: 172.17.30.9 adm: -- GitLab From 3df8d9dfabe33161a8966d140e7534edc24ee497 Mon Sep 17 00:00:00 2001 From: PARISOT Clement <clement.parisot@inria.fr> Date: Wed, 5 Mar 2025 17:29:28 +0100 Subject: [PATCH 2/2] [grenoble] vms : remove user VM pneyron-spack-vm --- .../sites/grenoble/servers/pneyron-spack-vm.json | 11 ----------- .../sites/grenoble/servers/user-machines.yaml | 5 ----- 2 files changed, 16 deletions(-) delete mode 100644 data/grid5000/sites/grenoble/servers/pneyron-spack-vm.json diff --git a/data/grid5000/sites/grenoble/servers/pneyron-spack-vm.json b/data/grid5000/sites/grenoble/servers/pneyron-spack-vm.json deleted file mode 100644 index c5075a92c9f..00000000000 --- a/data/grid5000/sites/grenoble/servers/pneyron-spack-vm.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "expire": "2024-03", - "kind": "virtual", - "network_adapters": { - "default": { - "ip": "172.16.29.1" - } - }, - "type": "server", - "uid": "pneyron-spack-vm" -} \ No newline at end of file diff --git a/input/grid5000/sites/grenoble/servers/user-machines.yaml b/input/grid5000/sites/grenoble/servers/user-machines.yaml index 749c2c03c09..852c045f09f 100644 --- a/input/grid5000/sites/grenoble/servers/user-machines.yaml +++ b/input/grid5000/sites/grenoble/servers/user-machines.yaml @@ -1,8 +1,3 @@ -pneyron-spack-vm: - kind: virtual - expire: 2024-03 - network_adapters: {default: {ip: 172.16.29.1}} - orichard-nix-datamove: kind: physical alias: [nix-datamove] -- GitLab