[nancy] retrait d'un doublon de srv-data dans input servers

data/grid5000/sites/nancy/servers/srv-data.json

@@ -5,14 +5,42 @@
     "public"
   ],
   "kind": "physical",
+  "monitoring": {
+    "metric": "power",
+    "wattmeter": "multiple"
+  },
   "network_adapters": {
     "bmc": {
       "ip": "172.17.79.16",
-      "mac": "F0:1F:AF:E1:99:E4"
+      "mac": "F0:1F:AF:E1:99:E4",
+      "mounted": true
     },
     "default": {
       "ip": "172.16.79.16",
-      "mac": "A0:36:9F:2C:5D:B8"
+      "mac": "A0:36:9F:2C:5D:B8",
+      "mounted": true
+    }
+  },
+  "sensors": {
+    "network": {
+      "available": true,
+      "resolution": 1
+    },
+    "power": {
+      "available": true,
+      "resolution": 1,
+      "via": {
+        "pdu": [
+          {
+            "port": 20,
+            "uid": "grisou-pdu1"
+          },
+          {
+            "port": 20,
+            "uid": "grisou-pdu2"
+          }
+        ]
+      }
     }
   },
   "serial": "GCQ7NZ1",

grid5000-all.json

@@ -157027,14 +157027,42 @@
             "public"
           ],
           "kind": "physical",
+          "monitoring": {
+            "metric": "power",
+            "wattmeter": "multiple"
+          },
           "network_adapters": {
             "bmc": {
               "ip": "172.17.79.16",
-              "mac": "F0:1F:AF:E1:99:E4"
+              "mac": "F0:1F:AF:E1:99:E4",
+              "mounted": true
             },
             "default": {
               "ip": "172.16.79.16",
-              "mac": "A0:36:9F:2C:5D:B8"
+              "mac": "A0:36:9F:2C:5D:B8",
+              "mounted": true
+            }
+          },
+          "sensors": {
+            "network": {
+              "available": true,
+              "resolution": 1
+            },
+            "power": {
+              "available": true,
+              "resolution": 1,
+              "via": {
+                "pdu": [
+                  {
+                    "port": 20,
+                    "uid": "grisou-pdu1"
+                  },
+                  {
+                    "port": 20,
+                    "uid": "grisou-pdu2"
+                  }
+                ]
+              }
             }
           },
           "serial": "GCQ7NZ1",

input/grid5000/sites/nancy/servers/servers.yaml

@@ -230,18 +230,6 @@ gras:
       mac: 00:0D:60:55:16:68
       ip: 172.16.79.14
 
-srv-data:
-  kind: physical
-  alias: [nfs,home-g5k,public]
-  warranty: 11.2018
-  serial: GCQ7NZ1
-  network_adapters:
-    default:
-      ip: 172.16.79.16
-      mac: A0:36:9F:2C:5D:B8
-    bmc:
-      ip: 172.17.79.16
-      mac: F0:1F:AF:E1:99:E4
 opensm:
   kind: physical
   alias: []