diff --git a/generators/lib/hash/hash.rb b/generators/lib/hash/hash.rb
index 3305502b42fcd5252c8a603f59536daed884fdd7..f594a6f8741ad0900026d7668c1ab691ed03f003 100644
--- a/generators/lib/hash/hash.rb
+++ b/generators/lib/hash/hash.rb
@@ -84,7 +84,7 @@ class ::Hash
}
end
- # sort a hash according to the position of the key in the array
+ # sort a hash according to the position of the key in the array.
def sort_by_array(array)
Hash[sort_by{|key, _| array.index(key) || length}]
end
diff --git a/generators/reference-api/reference-api.rb b/generators/reference-api/reference-api.rb
index 8f082934095a0769761105342646a5dd9a546361..c0a4520ae4fdf9582403e8aaf3c62d8393571b6e 100755
--- a/generators/reference-api/reference-api.rb
+++ b/generators/reference-api/reference-api.rb
@@ -120,6 +120,7 @@ global_hash["sites"].each do |site_uid, site|
# Populate "network_address", "switch" and "switch_port" from the network equipment description for each network adapters
node["network_adapters"].each { |network_adapter|
+ network_adapter["mac"] = network_adapter["mac"].downcase if network_adapter["mac"].is_a?(String)
# ib properties
network_adapter["ib_switch_card"] = network_adapter.delete("line_card") if network_adapter.key?("line_card")
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/adonis.yaml b/input/grid5000/sites/grenoble/clusters/adonis/adonis.yaml
index 9492065f4bffe844db1c9769fb6879cdcd6d1c9c..af0958a21d49284f2fed215338c378bd2670442a 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/adonis.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/adonis.yaml
@@ -3,7 +3,9 @@
model: Bull R422-E2 dual mobo + Tesla S1070
created_at: 2010-09-02
kavlan: true
-production: true
+queues:
+ - default
+ - admin
nodes:
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.yaml
index 2e9bb7475ec9c00654ce864b66783b4e31bb6ca9..ef3e3e1ba38144f0fb0305d05d3cee9664570ea9 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.yaml
@@ -11,10 +11,6 @@ adonis-1:
size: 251059544064
rev: 3.0
vendor: Western Digital
- operating_system:
- kernel: 2.6.32-5-amd64
- name: debian
- version: 6.0.6
network_adapters:
ib0:
mounted: true
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.yaml
index 8e2a39c7f45e41fd8d488185fd6f44ac18470e92..b68a2d044d42aab862695cff3d191f839d70ad2a 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.yaml
@@ -4,10 +4,6 @@ adonis-10:
version: R4222X80
release_date: 05/20/2010
vendor: American Megatrends Inc.
- operating_system:
- kernel: 2.6.32-5-amd64
- name: debian
- version: 6.0.6
network_adapters:
ib0:
mounted: true
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.yaml
index 33f307240364bbc3877c323e1a4e4062ed7bfd22..5ec70cff964b43b4cbe4ae0b710f7220fbedcc77 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.yaml
@@ -11,10 +11,6 @@ adonis-2:
size: 251059544064
rev: 3.0
vendor: Western Digital
- operating_system:
- kernel: 2.6.32-5-amd64
- name: debian
- version: 6.0.6
network_adapters:
ib0:
mounted: true
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.yaml
index 5bb4e2ca3e1c7821011d8f3c77524d30a9e92040..a7feed8fcfd4c530395807f34d9a1813e2e21e03 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.yaml
@@ -46,10 +46,6 @@ adonis-3:
size: 251059544064
rev: 3.0
vendor: Western Digital
- operating_system:
- kernel: 2.6.32-5-amd64
- name: debian
- version: 6.0.6
supported_job_types:
virtual: ivt
chassis:
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.yaml
index 9950bb7733a46bb5e5f6f11f261e0f6450cecc74..1dd6161ed9cc4508eab7ec8f840c39102f7e7e01 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.yaml
@@ -11,10 +11,6 @@ adonis-4:
size: 251059544064
rev: 3.0
vendor: Western Digital
- operating_system:
- kernel: 2.6.32-5-amd64
- name: debian
- version: 6.0.6
network_adapters:
ib0:
mounted: true
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.yaml
index 152f032efcc4e9dbadde7c49bf97cf8a11e0aa36..13192c73c2c9e83b5eb2b91d774e36ea2a5b830f 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.yaml
@@ -46,10 +46,6 @@ adonis-5:
size: 251059544064
rev: 3.0
vendor: Western Digital
- operating_system:
- kernel: 2.6.32-5-amd64
- name: debian
- version: 6.0.6
chassis:
serial: "1234567890"
manufacturer: Bull SAS
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.yaml
index 59d9b450f9ff864b73f623764d7b9e27161aa5af..38ad2b66df191898c5f0872b1001483d5d52622e 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.yaml
@@ -39,10 +39,6 @@ adonis-6:
bmc:
mac: 00:30:48:cc:ad:f2
ip: 172.17.18.6
- operating_system:
- kernel: 2.6.32-5-amd64
- name: debian
- version: 6.0.6
storage_devices:
sda:
model: WDC WD2502ABYS-0
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.yaml
index a4b0ec442d889c4c11e818bcd66e201f6b23e0db..9ccd825c15cd80087c55e54b4b8b289f09a76da7 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.yaml
@@ -46,10 +46,6 @@ adonis-7:
bmc:
mac: 00:30:48:cc:b5:e4
ip: 172.17.18.7
- operating_system:
- kernel: 2.6.32-5-amd64
- name: debian
- version: 6.0.6
chassis:
serial: "1234567890"
manufacturer: Bull SAS
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.yaml
index 0053a5b7eceba55a86fcb0782249c7dbeb145e9b..7a802fcc9fbd57815b3c531760d26015ea60ce18 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.yaml
@@ -4,10 +4,6 @@ adonis-8:
version: R4222X80
release_date: 05/20/2010
vendor: American Megatrends Inc.
- operating_system:
- kernel: 2.6.32-5-amd64
- name: debian
- version: 6.0.6
storage_devices:
sda:
model: WDC WD2502ABYS-0
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.yaml
index 058c46ce73c02c64ee7ffeb86f0fbffd1ab075bd..3a490b87ba3846653f409b6893ef5fae488ac296 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.yaml
@@ -39,10 +39,6 @@ adonis-9:
bmc:
mac: 00:25:90:4b:bd:b1
ip: 172.17.18.9
- operating_system:
- kernel: 2.6.32-5-amd64
- name: debian
- version: 6.0.6
storage_devices:
sda:
model: WDC WD2502ABYS-0
diff --git a/input/grid5000/sites/grenoble/clusters/edel/edel.yaml b/input/grid5000/sites/grenoble/clusters/edel/edel.yaml
index 3e45db6a4ccebe8dea6494d3a46c49076dbeb9ea..bfe52bd3cae10a9aaa1942fb6aa4cd3506d780c7 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/edel.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/edel.yaml
@@ -3,7 +3,9 @@
model: Bull bullx B500 compute blades
created_at: 2008-10-03
kavlan: true
-production: true
+queues:
+ - default
+ - admin
nodes:
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/genepi.yaml b/input/grid5000/sites/grenoble/clusters/genepi/genepi.yaml
index edbf2688e46a774ce13a80bcdd1980801fbf9471..4f98074773fb85ac8f3745db270c8601527dad33 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/genepi.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/genepi.yaml
@@ -3,7 +3,9 @@
model: Bull R422-E1
created_at: 2008-10-01
kavlan: true
-production: true
+queues:
+ - default
+ - admin
nodes:
diff --git a/input/grid5000/sites/grenoble/grenoble.yaml b/input/grid5000/sites/grenoble/grenoble.yaml
index c3ce5de8f80daca70436d2df629e3896e41d2ec0..6382c287a64fa9c2e33804f8a250617a9b9c2c3a 100644
--- a/input/grid5000/sites/grenoble/grenoble.yaml
+++ b/input/grid5000/sites/grenoble/grenoble.yaml
@@ -14,4 +14,6 @@ compilation_server: false
kavlan_ip_range: 10.4.0.0/14
virt_ip_range: 10.132.0.0/14
storage5k: false
-production: true
+queues:
+ - default
+ - admin
diff --git a/input/grid5000/sites/grenoble/pdus.rb b/input/grid5000/sites/grenoble/pdus.rb
deleted file mode 100644
index 6849097f05b86bcf7634761ae2bd30c87cd7378e..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/pdus.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-site :grenoble do |site_uid|
-
- 2.times do |i|
- pdu "adonis-pdu-#{i+1}" do |pdu_uid|
- vendor "Eaton Corporation"
- model "ePDU C20 16A"
- sensors [
- {
- :power => {
- :per_outlets => true,
- :snmp => {
- :available => true,
- :total_oids => ["iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1", "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2"],
- :unit => "W",
- :outlet_prefix_oid => "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0"
- }
- }
- }
- ]
- end
- end
-end
-
diff --git a/input/grid5000/sites/lille/clusters/chimint/chimint.yaml b/input/grid5000/sites/lille/clusters/chimint/chimint.yaml
index 00901ce09205794bf5d85f51c198611ffdd7361b..364d9c525866c816fa628777080fddbfbe79f387 100644
--- a/input/grid5000/sites/lille/clusters/chimint/chimint.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/chimint.yaml
@@ -2,7 +2,9 @@
model: Dell PowerEdge R410
created_at: 2011-03-25
kavlan: true
-production: true
+queues:
+ - default
+ - admin
nodes:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/chinqchint.yaml b/input/grid5000/sites/lille/clusters/chinqchint/chinqchint.yaml
index 45b9cbacc4886434d2e232128eb3568bbaa9091a..a2164ce9de353f1238ab842c4909c88990a389de 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/chinqchint.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/chinqchint.yaml
@@ -1,7 +1,9 @@
model: Altix Xe 310
created_at: 2007-09-10
kavlan: true
-production: true
+queues:
+ - default
+ - admin
nodes:
diff --git a/input/grid5000/sites/lille/clusters/chirloute/chirloute.yaml b/input/grid5000/sites/lille/clusters/chirloute/chirloute.yaml
index 5c25395a5d734ea38ea3844f5a91bc97253b119f..215f51dc9aeeeb261e81f2e6829725391b33a49e 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/chirloute.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/chirloute.yaml
@@ -2,7 +2,9 @@ model: Dell PowerEdge C6100
created_at: 2011-03-25
priority: 201199
kavlan: true
-production: true
+queues:
+ - default
+ - admin
nodes:
chirloute-[1-8]:
diff --git a/input/grid5000/sites/lille/lille.rb b/input/grid5000/sites/lille/lille.rb
deleted file mode 100644
index aff90c13c761ffc61f1189f873327275b48459d7..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lille/lille.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-site :lille do |site_uid|
- name "Lille"
- location "Lille, France"
- web "http://www.grid5000.fr/mediawiki/index.php/Lille:Home"
- description "Grid5000 Lille site"
- latitude 50.6500
- longitude 3.0833
- email_contact "support-staff@lists.grid5000.fr"
- sys_admin_contact "support-staff@lists.grid5000.fr"
- security_contact "support-staff@lists.grid5000.fr"
- user_support_contact "support-staff@lists.grid5000.fr"
- compilation_server false
- kavlan_ip_range "10.8.0.0/14"
- virt_ip_range "10.136.0.0/14"
- storage5k false
- production true
-end
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml
index 4990078792d49cee9bd50202b067aca42906eab9..e3341cfa8f7a419b00a3fc675578c3bde03bdb08 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml
@@ -1,7 +1,9 @@
model: PowerEdge 1950
created_at: 2011-12-01
kavlan: true
-production: true
+queues:
+ - default
+ - admin
nodes:
granduc-[1-22]:
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml
index a142b4372ea55ad9d4507e73e06c56097610b9a6..cd8f5d2d5903e7be277b6005db58a2cfaf552a80 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml
@@ -1,7 +1,9 @@
model: PowerEdge M620
created_at: 2013-09-10
kavlan: true
-production: true
+queues:
+ - default
+ - admin
nodes:
petitprince-[1-16]:
diff --git a/input/grid5000/sites/luxembourg/luxembourg.yaml b/input/grid5000/sites/luxembourg/luxembourg.yaml
index 4f749110eade1cd0f8f971c9529739b9f973880e..95c42be757ed13b5da12509219d9169c28d799e8 100644
--- a/input/grid5000/sites/luxembourg/luxembourg.yaml
+++ b/input/grid5000/sites/luxembourg/luxembourg.yaml
@@ -13,5 +13,7 @@ compilation_server: false
kavlan_ip_range: 10.40.0.0/14
virt_ip_range: 10.172.0.0/14
storage5k: true
-production: true
+queues:
+ - default
+ - admin
diff --git a/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml b/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
index 926218c9dd87b3edf997a904c24433e0c745b2de..49e70d8a86f29a4c4399b612b7802cc7da404984 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
@@ -3,7 +3,9 @@ model: Dell C6220
created_at: 2012-10-02
priority: 201299
kavlan: true
-production: true
+queues:
+ - default
+ - admin
nodes:
hercule-[1-4]:
diff --git a/input/grid5000/sites/lyon/clusters/orion/orion.yaml b/input/grid5000/sites/lyon/clusters/orion/orion.yaml
index 7a5764dd9df49917411be78f1d6a260b6d43d532..fcb24e465f5c66a1df77fbd3080a162a78bad406 100644
--- a/input/grid5000/sites/lyon/clusters/orion/orion.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/orion.yaml
@@ -2,7 +2,9 @@ model: Dell R720
created_at: 2012-09-14
priority: 201299
kavlan: true
-production: true
+queues:
+ - default
+ - admin
nodes:
orion-[1-4]:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
index 1a7a5dddee4ca17f0a89976ed81318a03178a68a..66cc402bfa473707e443056bcc36612c9f2d5d48 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
@@ -2,7 +2,9 @@
model: Sun Fire V20z
created_at: 2006-07-01
kavlan: true
-production: true
+queues:
+ - default
+ - admin
nodes:
sagittaire-[1-79]:
diff --git a/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml b/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
index 3c5aac66be741ae188c439f3c7e16ece86f854a8..ee32b10ec7121c96c06f8ce8c51c538b0de01021 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
@@ -2,7 +2,9 @@
model: Dell R720
created_at: 2012-09-14
kavlan: true
-production: true
+queues:
+ - default
+ - admin
nodes:
taurus-[1-16]:
diff --git a/input/grid5000/sites/lyon/lyon.rb b/input/grid5000/sites/lyon/lyon.rb
deleted file mode 100644
index df1d83f77030297b349b88b222e8c4c76b4d9fc1..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/lyon.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-site :lyon do |site_uid|
- name "Lyon"
- location "Lyon, France"
- web "https://www.grid5000.fr/mediawiki/index.php/Lyon:Home"
- description "Lyon Grid'5000 Site"
- latitude 45.7667
- longitude 4.8333
- email_contact "support-staff@lists.grid5000.fr"
- sys_admin_contact "support-staff@lists.grid5000.fr"
- security_contact "support-staff@lists.grid5000.fr"
- user_support_contact "support-staff@lists.grid5000.fr"
- compilation_server false
- kavlan_ip_range "10.12.0.0/14"
- virt_ip_range "10.140.0.0/14"
- storage5k true
- production true
-end
diff --git a/input/grid5000/sites/lyon/lyon.yaml b/input/grid5000/sites/lyon/lyon.yaml
index 9299e19213848bfae375a7927c66783c5a6b5c0e..fcae42b18c9dfa7e0cd015297848ba6e13dcd1d0 100644
--- a/input/grid5000/sites/lyon/lyon.yaml
+++ b/input/grid5000/sites/lyon/lyon.yaml
@@ -13,4 +13,6 @@ compilation_server: false
kavlan_ip_range: 10.12.0.0/14
virt_ip_range: 10.140.0.0/14
storage5k: true
-production: true
+queues:
+ - default
+ - admin
diff --git a/input/grid5000/sites/nancy/pdus.rb b/input/grid5000/sites/nancy/pdus.rb
deleted file mode 100644
index 534424a64b43b084dbe5330f2dd16140593408c2..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/pdus.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-site :nancy do |site_uid|
- 3.times do |i|
- pdu "graphene-pdu#{i+7}" do |pdu_uid|
- vendor "Eaton Corporation"
- model ""
- sensors [
- {
- :power => {
- :per_outlets => true,
- :snmp => {
- :available => true,
- :total_oids => ["iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1", "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2"],
- :unit => "W",
- :outlet_prefix_oid => "iso.3.6.1.4.1.534.6.6.7.6.5.1.3.0"
- }
- }
- }
- ]
- end
- end
- 6.times do |i|
- pdu "graphene-pdu#{i+1}" do |pdu_uid|
- vendor "APC"
- model "AP7953"
- sensors [
- {
- :power => {
- :per_outlets => false,
- :snmp => {
- :available => true,
- :total_oids => ["iso.3.6.1.4.1.318.1.1.12.1.16.0"],
- :unit => "W"
- }
- }
- }
- ]
- end
- end
- 2.times do |i|
- pdu "griffon-pdu#{i+1}" do |pdu_uid|
- vendor "APC"
- model "AP7953"
- sensors [
- {
- :power => {
- :per_outlets => false,
- :snmp => {
- :available => true,
- :total_oids => ["iso.3.6.1.4.1.318.1.1.12.1.16.0"],
- :unit => "W"
- }
- }
- }
- ]
- end
- end
- 2.times do |i|
- pdu "graoully-pdu#{i+1}" do |pdu_uid|
- vendor "APC"
- model "AP8653"
- sensors [
- {
- :power => {
- :per_outlets => true,
- :snmp => {
- :available => true,
- :total_oids => ["iso.3.6.1.4.1.318.1.1.12.1.16.0"],
- :unit => "W",
- :outlet_prefix_oid => "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7"
- }
- }
- }
- ]
- end
- end
- 2.times do |i|
- pdu "grimoire-pdu#{i+1}" do |pdu_uid|
- vendor "APC"
- model "AP8653"
- sensors [
- {
- :power => {
- :per_outlets => true,
- :snmp => {
- :available => true,
- :total_oids => ["iso.3.6.1.4.1.318.1.1.12.1.16.0"],
- :unit => "W",
- :outlet_prefix_oid => "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7"
- }
- }
- }
- ]
- end
- end
- 2.times do |i|
- pdu "grisou-pdu#{i+1}" do |pdu_uid|
- vendor "APC"
- model "AP8653"
- sensors [
- {
- :power => {
- :per_outlets => true,
- :snmp => {
- :available => true,
- :total_oids => ["iso.3.6.1.4.1.318.1.1.12.1.16.0"],
- :unit => "W",
- :outlet_prefix_oid => "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7"
- }
- }
- }
- ]
- end
- end
-end
diff --git a/input/grid5000/sites/nantes/clusters/econome/econome.yaml b/input/grid5000/sites/nantes/clusters/econome/econome.yaml
index f3af92b4e924ecda893f73808342226dca5f8df0..4809ce6bf246a30102534432c6a020efeff0d75d 100644
--- a/input/grid5000/sites/nantes/clusters/econome/econome.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/econome.yaml
@@ -2,7 +2,9 @@
model: Dell PowerEdge C6220
created_at: 2014-04-16
kavlan: true
-production: true
+queues:
+ - default
+ - admin
nodes:
econome-[1-22]:
diff --git a/input/grid5000/sites/nantes/nantes.rb b/input/grid5000/sites/nantes/nantes.rb
deleted file mode 100644
index 3b37414e9afe87f933798c01690c2ff9cebccd44..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nantes/nantes.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-site :nantes do |site_uid|
- name "Nantes"
- location "Nantes, France"
- web "http://www.mines-nantes.fr"
- description "Grid5000 Nantes site"
- latitude 47.282332
- longitude -1.520547
- email_contact "support-staff@lists.grid5000.fr"
- sys_admin_contact "support-staff@lists.grid5000.fr"
- security_contact "support-staff@lists.grid5000.fr"
- user_support_contact "support-staff@lists.grid5000.fr"
- compilation_server false
- kavlan_ip_range "10.40.0.0/14"
- virt_ip_range "10.176.0.0/14"
- storage5k false
- production true
-end
diff --git a/input/grid5000/sites/nantes/nantes.yaml b/input/grid5000/sites/nantes/nantes.yaml
index 41d8b9bc9d486c049b0ad1ed2fc01c499a6901a3..751749d2d024dd634ffd5486e8e716498d927628 100644
--- a/input/grid5000/sites/nantes/nantes.yaml
+++ b/input/grid5000/sites/nantes/nantes.yaml
@@ -13,5 +13,7 @@ compilation_server: false
kavlan_ip_range: 10.40.0.0/14
virt_ip_range: 10.176.0.0/14
storage5k: false
-production: true
+queues:
+ - default
+ - admin
diff --git a/input/grid5000/sites/reims/clusters/stremi/stremi.yaml b/input/grid5000/sites/reims/clusters/stremi/stremi.yaml
index 7312be4c854721c0cee2a41b9efdde43678d08be..92e036279072edc014a2d3085c20c2631e9d541d 100644
--- a/input/grid5000/sites/reims/clusters/stremi/stremi.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/stremi.yaml
@@ -2,7 +2,9 @@
model: HP ProLiant DL165 G7
created_at: 2011-04-18
kavlan: true
-production: true
+queues:
+ - default
+ - admin
nodes:
stremi-[1-44]:
diff --git a/input/grid5000/sites/reims/reims.rb b/input/grid5000/sites/reims/reims.rb
deleted file mode 100644
index 86f92a4990683629a808e3b4c64dafce9b2d6063..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/reims/reims.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-site :reims do |site_uid|
- name "Reims"
- location "Reims, France"
- web "http://www.grid5000.fr/mediawiki/index.php/Reims:Home"
- description "Grid5000 Reims site"
- latitude 49.244508
- longitude 4.062714
- email_contact "support-staff@lists.grid5000.fr"
- sys_admin_contact "support-staff@lists.grid5000.fr"
- security_contact "support-staff@lists.grid5000.fr"
- user_support_contact "support-staff@lists.grid5000.fr"
- compilation_server false
- kavlan_ip_range "10.36.0.0/14"
- virt_ip_range "10.168.0.0/14"
- storage5k false
- production true
-end
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml b/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml
index 9ca6a718422fa0e1ed152a494c753254542be783..2e8db4796562a71cce76f92157938cf18c8643c6 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml
@@ -2,7 +2,9 @@
model: Dell PowerEdge C6220 II
created_at: 2014-02-21
kavlan: true
-production: true
+queues:
+ - default
+ - admin
nodes:
paranoia-[1-8]:
diff --git a/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml b/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml
index 267357d7b527aaa38db6a88c25c9ed1a52866f70..c40289dd1c12a566e9964904029246ebdd9734de 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml
@@ -2,7 +2,9 @@
model: SUN FIRE X2270
created_at: 2010-01-25
kavlan: true
-production: true
+queues:
+ - default
+ - admin
nodes:
parapide-[1-25]:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml b/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml
index 0de60ce4031cb83d2a0cd74da402d8e989a79969..7aef628bab8152fd142fd45597d16ef0d8896285 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml
@@ -2,7 +2,9 @@
model: HP ProLiant DL165 G7
created_at: 2010-11-02
kavlan: true
-production: true
+queues:
+ - default
+ - admin
nodes:
parapluie-[1-40]:
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml b/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml
index a5305bd4f1aa45ded161022370838bcb50249d69..03b13bb4d888a56f34c463955b9012e2fc8e4840 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml
@@ -2,7 +2,9 @@
model: Dell PowerEdge R630
created_at: 2015-01-13
kavlan: true
-production: true
+queues:
+ - default
+ - admin
nodes:
parasilo-[1-28]:
diff --git a/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml b/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml
index d6afdef82ddbcf04e8800314100142ee37c2a895..29a367f6c9c2e7f69c0f56bb1cdbb3bbeb9318cc 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml
@@ -2,7 +2,9 @@
model: Dell PowerEdge R630
created_at: 2015-01-13
kavlan: true
-production: true
+queues:
+ - default
+ - admin
nodes:
paravance-[1-72]:
diff --git a/input/grid5000/sites/rennes/rennes.rb b/input/grid5000/sites/rennes/rennes.rb
deleted file mode 100644
index 47ae213cfc0a68fae27c638006d44a6cbbf981c3..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/rennes/rennes.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-site :rennes do |site_uid|
- name "Rennes"
- location "Rennes, France"
- web "http://www.irisa.fr"
- description "Grid5000 Rennes site"
- latitude 48.1000
- longitude -1.6667
- email_contact "support-staff@lists.grid5000.fr"
- sys_admin_contact "support-staff@lists.grid5000.fr"
- security_contact "support-staff@lists.grid5000.fr"
- user_support_contact "support-staff@lists.grid5000.fr"
- compilation_server false
- kavlan_ip_range "10.24.0.0/14"
- virt_ip_range "10.156.0.0/14"
- storage5k true
- production true
-end
diff --git a/input/grid5000/sites/sophia/clusters/sol/sol.yaml b/input/grid5000/sites/sophia/clusters/sol/sol.yaml
index 667147f1308ed40169c18e71f005c8b4a1ef0c85..6b4b8718c6104c01c28473d32c2169a54f8747bd 100644
--- a/input/grid5000/sites/sophia/clusters/sol/sol.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/sol.yaml
@@ -2,7 +2,9 @@
model: Sun Fire X2200 M2
created_at: 2007-02-23
kavlan: true
-production: true
+queues:
+ - default
+ - admin
nodes:
sol-[1-28]:
diff --git a/input/grid5000/sites/sophia/clusters/suno/suno.yaml b/input/grid5000/sites/sophia/clusters/suno/suno.yaml
index 46920531ca1ecda471ae445df6f0c34c52a22c76..6aac0b3789b5800bea99e492bcba914059020646 100644
--- a/input/grid5000/sites/sophia/clusters/suno/suno.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/suno.yaml
@@ -2,7 +2,9 @@
model: Dell PowerEdge R410
created_at: 2010-01-27
kavlan: true
-production: true
+queues:
+ - default
+ - admin
nodes:
suno-[1-45]:
diff --git a/input/grid5000/sites/sophia/sophia.rb b/input/grid5000/sites/sophia/sophia.rb
deleted file mode 100644
index c7ab83c7bc12a521a9998cc0dd9fd231b5a19781..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/sophia.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-site :sophia do |site_uid|
- name "Sophia-Antipolis"
- location "Sophia-Antipolis, France"
- web "http://www.grid5000.fr/mediawiki/index.php/Sophia:Home"
- description "Grid'5000 Sophia-Antipolis site"
- latitude 43.6161
- longitude 7.0678
- email_contact "support-staff@lists.grid5000.fr"
- sys_admin_contact "support-staff@lists.grid5000.fr"
- security_contact "support-staff@lists.grid5000.fr"
- user_support_contact "support-staff@lists.grid5000.fr"
- compilation_server false
- kavlan_ip_range "10.32.0.0/14"
- virt_ip_range "10.164.0.0/14"
- storage5k true
- production true
-end