From 83a4f7d3208d9f1b200272eecc0bcd7993d41644 Mon Sep 17 00:00:00 2001
From: Samir Noir <samir.noir@inria.fr>
Date: Fri, 17 Jan 2020 11:10:50 +0100
Subject: [PATCH] [grenoble/troll] fix ram amount on troll and add pmem

---
 data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json | 3 ++-
 data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json | 3 ++-
 data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json | 3 ++-
 data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json | 3 ++-
 .../grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml  | 3 ++-
 .../grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml  | 3 ++-
 .../grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml  | 3 ++-
 .../grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml  | 3 ++-
 8 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json
index ff01ba21dab..a8083a6ec9c 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json
@@ -39,7 +39,8 @@
     }
   },
   "main_memory": {
-    "ram_size": 2061584302080
+    "pmem_size": 1649267441664,
+    "ram_size": 412316860416
   },
   "monitoring": {
     "wattmeter": "true"
diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json
index e1e9aaef062..dff2981313c 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json
@@ -39,7 +39,8 @@
     }
   },
   "main_memory": {
-    "ram_size": 2061584302080
+    "pmem_size": 1649267441664,
+    "ram_size": 412316860416
   },
   "monitoring": {
     "wattmeter": "true"
diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json
index 7f2eed7ae41..50ee15a0683 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json
@@ -39,7 +39,8 @@
     }
   },
   "main_memory": {
-    "ram_size": 2061584302080
+    "pmem_size": 1649267441664,
+    "ram_size": 412316860416
   },
   "monitoring": {
     "wattmeter": "true"
diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json
index 16f716675ed..9580cde1acf 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json
@@ -39,7 +39,8 @@
     }
   },
   "main_memory": {
-    "ram_size": 2061584302080
+    "pmem_size": 1649267441664,
+    "ram_size": 412316860416
   },
   "monitoring": {
     "wattmeter": "true"
diff --git a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml
index a6b76dc41eb..b7a1a7bdcb5 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml
@@ -17,7 +17,8 @@ troll-1:
     name: PowerEdge R640
     serial: 7D9D013
   main_memory:
-    ram_size: 2061584302080
+    pmem_size: 1649267441664
+    ram_size: 412316860416
   network_adapters:
     bmc:
       ip: 172.17.22.1
diff --git a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml
index bf1030f3d51..4c36591d970 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml
@@ -17,7 +17,8 @@ troll-2:
     name: PowerEdge R640
     serial: 4D9D013
   main_memory:
-    ram_size: 2061584302080
+    pmem_size: 1649267441664
+    ram_size: 412316860416
   network_adapters:
     bmc:
       ip: 172.17.22.2
diff --git a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml
index e2326b5e351..4f14c719945 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml
@@ -17,7 +17,8 @@ troll-3:
     name: PowerEdge R640
     serial: 5D9D013
   main_memory:
-    ram_size: 2061584302080
+    pmem_size: 1649267441664
+    ram_size: 412316860416
   network_adapters:
     bmc:
       ip: 172.17.22.3
diff --git a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml
index 903e30f70db..0a47ec83d23 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml
@@ -17,7 +17,8 @@ troll-4:
     name: PowerEdge R640
     serial: 6D9D013
   main_memory:
-    ram_size: 2061584302080
+    pmem_size: 1649267441664
+    ram_size: 412316860416
   network_adapters:
     bmc:
       ip: 172.17.22.4
-- 
GitLab