Commit 4f354c36 authored by Jérémie Gaidamour's avatar Jérémie Gaidamour
Browse files

[nancy] Update dev branch

parent f599f21f
...@@ -106,8 +106,8 @@ global_hash["sites"].each do |site_uid, site| ...@@ -106,8 +106,8 @@ global_hash["sites"].each do |site_uid, site|
node["main_memory"] = {} unless node.key?("main_memory") node["main_memory"] = {} unless node.key?("main_memory")
node["main_memory"]["virtual_size"] = nil unless node["main_memory"].key?("virtual_size") node["main_memory"]["virtual_size"] = nil unless node["main_memory"].key?("virtual_size")
# node["monitoring"] = {} unless node.key?("monitoring") node["monitoring"] = {} unless node.key?("monitoring")
# node["monitoring"]["wattmeter"] = false unless node["monitoring"].key?("wattmeter") node["monitoring"]["wattmeter"] = false unless node["monitoring"].key?("wattmeter")
# Rename keys # Rename keys
node["storage_devices"] = node.delete("block_devices") node["storage_devices"] = node.delete("block_devices")
...@@ -116,6 +116,12 @@ global_hash["sites"].each do |site_uid, site| ...@@ -116,6 +116,12 @@ global_hash["sites"].each do |site_uid, site|
node["chassis"]["name"] = node["chassis"].delete("product_name") node["chassis"]["name"] = node["chassis"].delete("product_name")
node["chassis"]["serial"] = node["chassis"].delete("serial_number") node["chassis"]["serial"] = node["chassis"].delete("serial_number")
end end
# Delete keys
node["storage_devices"].keys.each { |key|
node["storage_devices"][key].delete("timeread") if node["storage_devices"][key].key?("timeread")
node["storage_devices"][key].delete("timewrite") if node["storage_devices"][key].key?("timewrite")
}
# Type conversion # Type conversion
node["network_adapters"].each { |key, hash| hash["rate"] = hash["rate"].to_i if hash["rate"].is_a?(Float) } node["network_adapters"].each { |key, hash| hash["rate"] = hash["rate"].to_i if hash["rate"].is_a?(Float) }
...@@ -125,7 +131,7 @@ global_hash["sites"].each do |site_uid, site| ...@@ -125,7 +131,7 @@ global_hash["sites"].each do |site_uid, site|
node["storage_devices"] = node["storage_devices"].sort_by_array(["sda", "sdb", "sdc", "sdd", "sde"]).values node["storage_devices"] = node["storage_devices"].sort_by_array(["sda", "sdb", "sdc", "sdd", "sde"]).values
node["network_adapters"].each { |key, hash| node["network_adapters"][key]["device"] = key; } # Add "device: ethX" within the hash node["network_adapters"].each { |key, hash| node["network_adapters"][key]["device"] = key; } # Add "device: ethX" within the hash
node["network_adapters"] = node["network_adapters"].sort_by_array(["eth0", "eth1", "eth2", "eth3", "ib0", "ib1", "ib2", "ib3", "bmc"]).values node["network_adapters"] = node["network_adapters"].sort_by_array(["eth0", "eth1", "eth2", "eth3", "eth4", "eth5", "eth6", "ib0", "ib1", "ib2", "ib3", "bmc"]).values
# Populate "network_address", "switch" and "switch_port" from the network equipment description for each network adapters # Populate "network_address", "switch" and "switch_port" from the network equipment description for each network adapters
node["network_adapters"].each { |network_adapter| node["network_adapters"].each { |network_adapter|
...@@ -178,6 +184,8 @@ global_hash["sites"].each do |site_uid, site| ...@@ -178,6 +184,8 @@ global_hash["sites"].each do |site_uid, site|
node.delete("pdu") node.delete("pdu")
end end
node.delete("kavlan")
#pp cluster_path.join("nodes","#{node_uid}.json") #pp cluster_path.join("nodes","#{node_uid}.json")
write_json(cluster_path.join("nodes","#{node_uid}.json"), node) write_json(cluster_path.join("nodes","#{node_uid}.json"), node)
end end
......
...@@ -19,8 +19,6 @@ nodes: ...@@ -19,8 +19,6 @@ nodes:
queues: queues:
- admin - admin
- production - production
main_memory:
virtual_size: nil
operating_system: operating_system:
release: Jessie release: Jessie
block_devices: block_devices:
...@@ -43,7 +41,7 @@ nodes: ...@@ -43,7 +41,7 @@ nodes:
vendor: Intel Corporation vendor: Intel Corporation
model: 82599ES 10-Gigabit SFI/SFP+ Network Connection model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
eth1: eth1:
rate: 10.G rate: 10000000000 #10G
enabled: false enabled: false
mountable: false mountable: false
bridged: false bridged: false
...@@ -51,7 +49,7 @@ nodes: ...@@ -51,7 +49,7 @@ nodes:
vendor: Intel Corporation vendor: Intel Corporation
model: 82599ES 10-Gigabit SFI/SFP+ Network Connection model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
eth2: eth2:
rate: 10.G rate: 10000000000 #10G
enabled: false enabled: false
mountable: false mountable: false
bridged: false bridged: false
...@@ -59,7 +57,7 @@ nodes: ...@@ -59,7 +57,7 @@ nodes:
vendor: Intel Corporation vendor: Intel Corporation
model: Ethernet 10G 2P X520 Adapter model: Ethernet 10G 2P X520 Adapter
eth3: eth3:
rate: 10.G rate: 10000000000 #10G
enabled: false enabled: false
mountable: false mountable: false
bridged: false bridged: false
...@@ -67,7 +65,7 @@ nodes: ...@@ -67,7 +65,7 @@ nodes:
vendor: Intel Corporation vendor: Intel Corporation
model: Ethernet 10G 2P X520 Adapter model: Ethernet 10G 2P X520 Adapter
eth4: eth4:
rate: 1.G rate: 1000000000 # 1G
enabled: false enabled: false
mountable: false mountable: false
bridged: false bridged: false
...@@ -75,7 +73,7 @@ nodes: ...@@ -75,7 +73,7 @@ nodes:
vendor: Intel Corporation vendor: Intel Corporation
model: I350 Gigabit Network Connection model: I350 Gigabit Network Connection
eth5: eth5:
rate: 1.G rate: 1000000000 # 1G
enabled: false enabled: false
mountable: false mountable: false
bridged: false bridged: false
...@@ -86,14 +84,19 @@ nodes: ...@@ -86,14 +84,19 @@ nodes:
enabled: true enabled: true
mountable: true mountable: true
mounted: true mounted: true
bridged: true bridged: false
device: ib0 device: ib0
vendor: Mellanox vendor: Mellanox
model: MT27500 Family [ConnectX-3] model: MT27500 Family [ConnectX-3]
switch: sgraoullyib switch: sgraoullyib
hwid: null
ib_switch_card: null
ib_switch_card_pos: null
ip6: null
mac: null
bmc: bmc:
interface: Ethernet interface: Ethernet
rate: 1.G rate: 1000000000 # 1G
enabled: true enabled: true
mounted: false mounted: false
mountable: false mountable: false
......
...@@ -23,7 +23,7 @@ nodes: ...@@ -23,7 +23,7 @@ nodes:
24:6E:96:03:09:F8 24:6E:96:03:09:F8
24:6E:96:03:0F:50 24:6E:96:03:0F:50
)[i-1] %> )[i-1] %>
ib: ib0:
ip: 172.18.70.<%= i %> ip: 172.18.70.<%= i %>
bmc: bmc:
ip: 172.17.70.<%= i %> ip: 172.17.70.<%= i %>
......
...@@ -8,11 +8,11 @@ talc-1: ...@@ -8,11 +8,11 @@ talc-1:
sda: sda:
size: 320072933376 size: 320072933376
model: Hitachi HDP72503 model: Hitachi HDP72503
rev: GM3O rev: A5CA
device: sda device: sda
operating_system: operating_system:
kernel: 3.2.0-4-amd64 kernel: 3.2.0-4-amd64
version: 7.2 version: 8.2
name: debian name: debian
architecture: architecture:
smp_size: 2 smp_size: 2
......
...@@ -8,7 +8,7 @@ talc-10: ...@@ -8,7 +8,7 @@ talc-10:
sda: sda:
size: 320072933376 size: 320072933376
model: Hitachi HDT72103 model: Hitachi HDT72103
rev: ST2O rev: A3AA
device: sda device: sda
architecture: architecture:
smp_size: 2 smp_size: 2
...@@ -16,7 +16,7 @@ talc-10: ...@@ -16,7 +16,7 @@ talc-10:
platform_type: x86_64 platform_type: x86_64
operating_system: operating_system:
kernel: 3.2.0-4-amd64 kernel: 3.2.0-4-amd64
version: 7.2 version: 8.2
name: debian name: debian
processor: processor:
cache_l1i: 32768 cache_l1i: 32768
...@@ -38,7 +38,7 @@ talc-10: ...@@ -38,7 +38,7 @@ talc-10:
eth0: eth0:
mounted: true mounted: true
enabled: true enabled: true
rate: 1000000000 rate: 100000000
mac: 00:e0:81:b2:c0:c2 mac: 00:e0:81:b2:c0:c2
ip: 172.16.66.10 ip: 172.16.66.10
mountable: true mountable: true
......
...@@ -8,11 +8,11 @@ talc-100: ...@@ -8,11 +8,11 @@ talc-100:
sda: sda:
size: 320072933376 size: 320072933376
model: Hitachi HDP72503 model: Hitachi HDP72503
rev: GM3O rev: A5CA
device: sda device: sda
operating_system: operating_system:
kernel: 3.2.0-4-amd64 kernel: 3.2.0-4-amd64
version: 7.2 version: 8.2
name: debian name: debian
architecture: architecture:
smp_size: 2 smp_size: 2
......
...@@ -8,7 +8,7 @@ talc-101: ...@@ -8,7 +8,7 @@ talc-101:
sda: sda:
size: 320072933376 size: 320072933376
model: Hitachi HDP72503 model: Hitachi HDP72503
rev: GM3O rev: A5CA
device: sda device: sda
architecture: architecture:
smp_size: 2 smp_size: 2
...@@ -16,7 +16,7 @@ talc-101: ...@@ -16,7 +16,7 @@ talc-101:
platform_type: x86_64 platform_type: x86_64
operating_system: operating_system:
kernel: 3.2.0-4-amd64 kernel: 3.2.0-4-amd64
version: 7.2 version: 8.2
name: debian name: debian
processor: processor:
cache_l1i: 32768 cache_l1i: 32768
......
...@@ -8,11 +8,11 @@ talc-102: ...@@ -8,11 +8,11 @@ talc-102:
sda: sda:
size: 320072933376 size: 320072933376
model: Hitachi HDP72503 model: Hitachi HDP72503
rev: GM3O rev: A5CA
device: sda device: sda
operating_system: operating_system:
kernel: 3.2.0-4-amd64 kernel: 3.2.0-4-amd64
version: 7.2 version: 8.2
name: debian name: debian
architecture: architecture:
smp_size: 2 smp_size: 2
...@@ -38,7 +38,7 @@ talc-102: ...@@ -38,7 +38,7 @@ talc-102:
eth0: eth0:
mounted: true mounted: true
enabled: true enabled: true
rate: 1000000000 rate: 100000000
mac: 00:e0:81:b5:9c:92 mac: 00:e0:81:b5:9c:92
ip: 172.16.66.102 ip: 172.16.66.102
mountable: true mountable: true
......
...@@ -8,11 +8,11 @@ talc-103: ...@@ -8,11 +8,11 @@ talc-103:
sda: sda:
size: 320072933376 size: 320072933376
model: Hitachi HDP72503 model: Hitachi HDP72503
rev: GM3O rev: A5CA
device: sda device: sda
operating_system: operating_system:
kernel: 3.2.0-4-amd64 kernel: 3.2.0-4-amd64
version: 7.2 version: 8.2
name: debian name: debian
architecture: architecture:
smp_size: 2 smp_size: 2
...@@ -38,7 +38,7 @@ talc-103: ...@@ -38,7 +38,7 @@ talc-103:
eth0: eth0:
mounted: true mounted: true
enabled: true enabled: true
rate: 1000000000 rate: 100000000
mac: 00:e0:81:b5:56:96 mac: 00:e0:81:b5:56:96
ip: 172.16.66.103 ip: 172.16.66.103
mountable: true mountable: true
......
...@@ -8,7 +8,7 @@ talc-104: ...@@ -8,7 +8,7 @@ talc-104:
sda: sda:
size: 320072933376 size: 320072933376
model: Hitachi HDP72503 model: Hitachi HDP72503
rev: GM3O rev: A5CA
device: sda device: sda
architecture: architecture:
smp_size: 2 smp_size: 2
...@@ -16,7 +16,7 @@ talc-104: ...@@ -16,7 +16,7 @@ talc-104:
platform_type: x86_64 platform_type: x86_64
operating_system: operating_system:
kernel: 3.2.0-4-amd64 kernel: 3.2.0-4-amd64
version: 7.2 version: 8.2
name: debian name: debian
processor: processor:
cache_l1i: 32768 cache_l1i: 32768
...@@ -38,7 +38,7 @@ talc-104: ...@@ -38,7 +38,7 @@ talc-104:
eth0: eth0:
mounted: true mounted: true
enabled: true enabled: true
rate: 1000000000 rate: 100000000
mac: 00:e0:81:b5:9c:48 mac: 00:e0:81:b5:9c:48
ip: 172.16.66.104 ip: 172.16.66.104
mountable: true mountable: true
......
...@@ -8,7 +8,7 @@ talc-105: ...@@ -8,7 +8,7 @@ talc-105:
sda: sda:
size: 320072933376 size: 320072933376
model: Hitachi HDT72103 model: Hitachi HDT72103
rev: ST2O rev: A31B
device: sda device: sda
architecture: architecture:
smp_size: 2 smp_size: 2
...@@ -16,7 +16,7 @@ talc-105: ...@@ -16,7 +16,7 @@ talc-105:
platform_type: x86_64 platform_type: x86_64
operating_system: operating_system:
kernel: 3.2.0-4-amd64 kernel: 3.2.0-4-amd64
version: 7.2 version: 8.2
name: debian name: debian
processor: processor:
cache_l1i: 32768 cache_l1i: 32768
...@@ -38,7 +38,7 @@ talc-105: ...@@ -38,7 +38,7 @@ talc-105:
eth0: eth0:
mounted: true mounted: true
enabled: true enabled: true
rate: 1000000000 rate: 100000000
mac: 00:e0:81:b5:9b:a2 mac: 00:e0:81:b5:9b:a2
ip: 172.16.66.105 ip: 172.16.66.105
mountable: true mountable: true
......
...@@ -8,11 +8,11 @@ talc-106: ...@@ -8,11 +8,11 @@ talc-106:
sda: sda:
size: 320072933376 size: 320072933376
model: Hitachi HDP72503 model: Hitachi HDP72503
rev: GM3O rev: A5CA
device: sda device: sda
operating_system: operating_system:
kernel: 3.2.0-4-amd64 kernel: 3.2.0-4-amd64
version: 7.2 version: 8.2
name: debian name: debian
architecture: architecture:
smp_size: 2 smp_size: 2
...@@ -38,7 +38,7 @@ talc-106: ...@@ -38,7 +38,7 @@ talc-106:
eth0: eth0:
mounted: true mounted: true
enabled: true enabled: true
rate: 1000000000 rate: 100000000
mac: 00:e0:81:b8:b7:ee mac: 00:e0:81:b8:b7:ee
ip: 172.16.66.106 ip: 172.16.66.106
mountable: true mountable: true
......
...@@ -8,7 +8,7 @@ talc-107: ...@@ -8,7 +8,7 @@ talc-107:
sda: sda:
size: 320072933376 size: 320072933376
model: Hitachi HDT72103 model: Hitachi HDT72103
rev: ST2O rev: A31B
device: sda device: sda
architecture: architecture:
smp_size: 2 smp_size: 2
...@@ -16,7 +16,7 @@ talc-107: ...@@ -16,7 +16,7 @@ talc-107:
platform_type: x86_64 platform_type: x86_64
operating_system: operating_system:
kernel: 3.2.0-4-amd64 kernel: 3.2.0-4-amd64
version: 7.2 version: 8.2
name: debian name: debian
processor: processor:
cache_l1i: 32768 cache_l1i: 32768
...@@ -38,7 +38,7 @@ talc-107: ...@@ -38,7 +38,7 @@ talc-107:
eth0: eth0:
mounted: true mounted: true
enabled: true enabled: true
rate: 1000000000 rate: 100000000
mac: 00:e0:81:b1:c4:76 mac: 00:e0:81:b1:c4:76
ip: 172.16.66.107 ip: 172.16.66.107
mountable: true mountable: true
......
...@@ -8,11 +8,11 @@ talc-108: ...@@ -8,11 +8,11 @@ talc-108:
sda: sda:
size: 320072933376 size: 320072933376
model: Hitachi HDT72103 model: Hitachi HDT72103
rev: ST2O rev: A31B
device: sda device: sda
operating_system: operating_system:
kernel: 3.2.0-4-amd64 kernel: 3.2.0-4-amd64
version: 7.2 version: 8.2
name: debian name: debian
architecture: architecture:
smp_size: 2 smp_size: 2
...@@ -38,7 +38,7 @@ talc-108: ...@@ -38,7 +38,7 @@ talc-108:
eth0: eth0:
mounted: true mounted: true
enabled: true enabled: true
rate: 1000000000 rate: 100000000
mac: 00:e0:81:b1:c0:12 mac: 00:e0:81:b1:c0:12
ip: 172.16.66.108 ip: 172.16.66.108
mountable: true mountable: true
......
...@@ -8,7 +8,7 @@ talc-109: ...@@ -8,7 +8,7 @@ talc-109:
sda: sda:
size: 320072933376 size: 320072933376
model: Hitachi HDT72103 model: Hitachi HDT72103
rev: ST2O rev: A31B
device: sda device: sda
architecture: architecture:
smp_size: 2 smp_size: 2
...@@ -16,7 +16,7 @@ talc-109: ...@@ -16,7 +16,7 @@ talc-109:
platform_type: x86_64 platform_type: x86_64
operating_system: operating_system:
kernel: 3.2.0-4-amd64 kernel: 3.2.0-4-amd64
version: 7.2 version: 8.2
name: debian name: debian
processor: processor:
cache_l1i: 32768 cache_l1i: 32768
......
...@@ -8,7 +8,7 @@ talc-11: ...@@ -8,7 +8,7 @@ talc-11:
sda: sda:
size: 320072933376