[nancy] grisou - fixed configuration

generators/reference-api/reference-api.rb

@@ -146,7 +146,7 @@ global_hash["sites"].each do |site_uid, site|
         #   pp "#{network_adapter["network_address"]}, #{network_adapter["switch"]} or #{network_adapter["switch_port"]}"
         # end
         
-        if network_adapter["mounted"] and /^eth[0-9]$/.match(network_adapter["device"])
+        if network_adapter["mounted"] and /^eth[0-9]$/.match(network_adapter["device"]) && ! network_adapter.key?("switch")
           # Primary network_adapter
           network_adapter["network_address"] = "#{node_uid}.#{site_uid}.grid5000.fr"
          

input/grid5000/sites/nancy/clusters/grisou/grisou.yaml

@@ -57,7 +57,7 @@ nodes:
         rate: 10.0e+9
         enabled: false 
         mountable: true
-        bridged: true
+        bridged: false
         device: eth1
         vendor: Intel Corporation
         model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
@@ -65,7 +65,7 @@ nodes:
         rate: 10.0e+9
         enabled: false
         mountable: true
-        bridged: true
+        bridged: false
         device: eth2
         vendor: Intel Corporation
         model: Ethernet 10G 2P X520 Adapter
@@ -73,7 +73,7 @@ nodes:
         rate: 10.0e+9
         enabled: false 
         mountable: true
-        bridged: true
+        bridged: false
         device: eth3
         vendor: Intel Corporation
         model: Ethernet 10G 2P X520 Adapter
@@ -103,7 +103,7 @@ nodes:
         device: bmc
 
 # Node with 1 mounted interface
-  grisou-[41-48]:
+  grisou-[41-49]:
     network_adapters:
       eth0:
         enabled: true 
@@ -162,7 +162,7 @@ nodes:
         device: bmc
 
 # Node with infiniband
-  grisou-[49-50]:
+  grisou-[50-51]:
     network_adapters:
       eth0:
         enabled: true 
@@ -207,8 +207,14 @@ nodes:
         enabled: true 
         mountable: true
         mounted: true
-        bridged: true
+        bridged: false
         device: eth2
         vendor: Mellanox
         model: MT27500 Family [ConnectX-3]
         switch: sgraoullyib
+        guid: null
+        hwid: null
+        ib_switch_card: null
+        ib_switch_card_pos: null
+        version: null
+        ip6: null
\ No newline at end of file

input/grid5000/sites/nancy/clusters/grisou/grisou.yaml.erb

@@ -58,6 +58,7 @@ nodes:
                     24:6E:96:03:0B:A0
                     24:6E:96:03:24:20
                    )[i-1] %>
+<% if i < 50 %>
       eth1:
 <% i61_111 = i + 60 %>
         ip: 172.16.72.<%= i61_111 %>
@@ -67,6 +68,10 @@ nodes:
       eth3:
 <% i181_231 = i + 180 %>
         ip: 172.16.72.<%= i181_231 %>
+<% else %>
+      eth2:
+        ip: 172.18.72.<%= i %>
+<% end %>
       bmc:
         ip: 172.17.72.<%= i %>
         mac: <%= %w(

input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml

@@ -61,7 +61,7 @@ grisou-50:
       driver: ib_ipoib
       mac: 80:00:00:48:fe:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:50:71
       rate: 0
-      mounted: false
+      mounted: true
       management: false
   operating_system:
     name: debian

input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml

@@ -61,7 +61,7 @@ grisou-51:
       driver: ib_ipoib
       mac: 80:00:00:48:fe:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:4f:81
       rate: 0
-      mounted: false
+      mounted: true
       management: false
   operating_system:
     name: debian