[lyon] Update sagittaire-[70-79] hardware (#4531, #4532)

8c76e12c · Simon Delamare · f494274c · 8c76e12c · 8c76e12c · 8c76e12c
Commit 8c76e12c authored 12 years ago by Simon Delamare
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.json
@@ -5,7 +5,7 @@
    "smt_size": 2
  },
  "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 17179869184,
    "virtual_size": null
  },
  "network_adapters": [
@@ -59,6 +59,11 @@
    "version": "250"
  },
  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    },
    {
      "driver": "mptspi",
      "interface": "SCSI",

--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.json
@@ -5,7 +5,7 @@
    "smt_size": 2
  },
  "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 17179869184,
    "virtual_size": null
  },
  "network_adapters": [
@@ -59,6 +59,11 @@
    "version": "250"
  },
  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    },
    {
      "driver": "mptspi",
      "interface": "SCSI",

--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.json
@@ -5,7 +5,7 @@
    "smt_size": 2
  },
  "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 17179869184,
    "virtual_size": null
  },
  "network_adapters": [
@@ -59,6 +59,11 @@
    "version": "250"
  },
  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    },
    {
      "driver": "mptspi",
      "interface": "SCSI",

--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.json
@@ -5,7 +5,7 @@
    "smt_size": 2
  },
  "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 17179869184,
    "virtual_size": null
  },
  "network_adapters": [
@@ -59,6 +59,11 @@
    "version": "250"
  },
  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    },
    {
      "driver": "mptspi",
      "interface": "SCSI",

--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.json
@@ -5,7 +5,7 @@
    "smt_size": 2
  },
  "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 17179869184,
    "virtual_size": null
  },
  "network_adapters": [
@@ -59,6 +59,11 @@
    "version": "250"
  },
  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    },
    {
      "driver": "mptspi",
      "interface": "SCSI",

--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.json
@@ -5,7 +5,7 @@
    "smt_size": 2
  },
  "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 17179869184,
    "virtual_size": null
  },
  "network_adapters": [
@@ -59,6 +59,11 @@
    "version": "250"
  },
  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    },
    {
      "driver": "mptspi",
      "interface": "SCSI",

--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.json
@@ -5,7 +5,7 @@
    "smt_size": 2
  },
  "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 17179869184,
    "virtual_size": null
  },
  "network_adapters": [
@@ -59,6 +59,11 @@
    "version": "250"
  },
  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    },
    {
      "driver": "mptspi",
      "interface": "SCSI",

--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.json
@@ -5,7 +5,7 @@
    "smt_size": 2
  },
  "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 17179869184,
    "virtual_size": null
  },
  "network_adapters": [
@@ -59,6 +59,11 @@
    "version": "250"
  },
  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    },
    {
      "driver": "mptspi",
      "interface": "SCSI",

--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.json
@@ -5,7 +5,7 @@
    "smt_size": 2
  },
  "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 17179869184,
    "virtual_size": null
  },
  "network_adapters": [
@@ -59,6 +59,11 @@
    "version": "250"
  },
  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    },
    {
      "driver": "mptspi",
      "interface": "SCSI",

--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.json
@@ -5,7 +5,7 @@
    "smt_size": 2
  },
  "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 17179869184,
    "virtual_size": null
  },
  "network_adapters": [
@@ -59,6 +59,11 @@
    "version": "250"
  },
  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    },
    {
      "driver": "mptspi",
      "interface": "SCSI",

--- a/generators/input/sites/lyon/clusters/sagittaire.rb
+++ b/generators/input/sites/lyon/clusters/sagittaire.rb
@@ -23,19 +23,33 @@ site :lyon do |site_uid|
          :cache_l1d => nil,
          :cache_l2 => 1.MiB
        })
-        main_memory({
-          :ram_size => 2.GiB, # bytes
-          :virtual_size => nil
-        })
+        if (i<69) then
+          main_memory({
+            :ram_size => 2.GiB, # bytes
+            :virtual_size => nil
+          })
+        else
+          main_memory({
+            :ram_size => 16.GiB, # bytes
+            :virtual_size => nil
+          })
+        end
        operating_system({
          :name => "Debian",
          :release => "6.0",
          :version => nil,
          :kernel => "2.6.32"
        })
-        storage_devices [
-          {:interface => 'SCSI', :size => 73.GB, :driver => "mptspi"}
-        ]
+        if (i<69) then
+          storage_devices [
+            {:interface => 'SCSI', :size => 73.GB, :driver => "mptspi"}
+          ]
+        else
+          storage_devices [
+            {:interface => 'SCSI', :size => 73.GB, :driver => "mptspi"},
+            {:interface => 'SCSI', :size => 73.GB, :driver => "mptspi"}
+          ]
+        end
        network_adapters [{
          :interface => 'Ethernet',
          :rate => 1.G,