Commit 7370a8dc authored by Jérémie Gaidamour's avatar Jérémie Gaidamour
Browse files

Merge branch 'master' into dev

Conflicts:
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-10.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-100.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-101.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-102.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-105.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-106.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-107.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-108.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-109.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-11.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-110.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-111.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-112.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-113.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-115.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-116.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-117.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-118.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-119.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-12.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-120.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-121.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-122.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-123.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-124.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-125.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-126.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-127.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-128.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-13.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-130.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-131.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-132.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-133.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-14.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-15.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-16.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-17.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-18.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-2.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-20.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-22.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-23.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-24.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-25.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-29.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-3.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-30.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-31.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-32.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-33.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-34.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-35.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-36.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-38.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-39.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-4.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-40.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-41.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-42.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-43.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-45.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-47.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-48.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-49.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-5.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-50.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-51.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-52.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-54.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-57.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-58.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-59.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-6.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-60.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-64.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-65.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-66.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-7.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-72.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-75.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-76.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-77.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-78.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-79.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-8.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-80.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-81.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-82.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-83.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-84.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-85.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-86.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-87.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-88.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-9.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-90.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-91.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-92.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-93.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-94.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-95.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-96.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-97.json
	data/grid5000/sites/nancy/clusters/talc/nodes/talc-99.json
	data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
	data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json
	data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json
	data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json
	data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json
	data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json
	data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json
	data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json
	generators/input/sites/grenoble/clusters/adonis/adonis.rb
	generators/input/sites/grenoble/clusters/adonis/adonis_manual.yaml
	generators/input/sites/grenoble/clusters/edel/edel.rb
	generators/input/sites/grenoble/clusters/genepi/genepi.rb
	generators/input/sites/lille/clusters/chimint/chimint.rb
	generators/input/sites/lille/clusters/chinqchint/chinqchint.rb
	generators/input/sites/lille/clusters/chirloute/chirloute.rb
	generators/input/sites/luxembourg/clusters/granduc/granduc.rb
	generators/input/sites/luxembourg/clusters/petitprince/petitprince.rb
	generators/input/sites/lyon/clusters/hercule/hercule.rb
	generators/input/sites/lyon/clusters/orion/orion.rb
	generators/input/sites/lyon/clusters/orion/orion_manual.yaml
	generators/input/sites/lyon/clusters/sagittaire/sagittaire.rb
	generators/input/sites/lyon/clusters/sagittaire/sagittaire_manual.yaml
	generators/input/sites/lyon/clusters/taurus/taurus.rb
	generators/input/sites/lyon/clusters/taurus/taurus_manual.yaml
	generators/input/sites/nancy/clusters/graphene/graphene.rb
	generators/input/sites/nancy/clusters/graphene/graphene_manual.yaml
	generators/input/sites/nancy/clusters/graphique/graphique.rb
	generators/input/sites/nancy/clusters/graphite/graphite.rb
	generators/input/sites/nancy/clusters/graphite/graphite_manual.yaml
	generators/input/sites/nancy/clusters/griffon/griffon.rb
	generators/input/sites/nancy/clusters/griffon/griffon_manual.yaml
	generators/input/sites/nancy/clusters/mbi/nodes/mbi-17.yaml
	generators/input/sites/nancy/clusters/mbi/nodes/mbi-2.yaml
	generators/input/sites/nancy/clusters/mbi/nodes/mbi-3.yaml
	generators/input/sites/nancy/clusters/mbi/nodes/mbi-31.yaml
	generators/input/sites/nancy/clusters/mbi/nodes/mbi-4.yaml
	generators/input/sites/nancy/clusters/mbi/nodes/mbi-5.yaml
	generators/input/sites/nancy/clusters/talc/nodes/talc-1.yaml
	generators/input/sites/nancy/clusters/talc/nodes/talc-110.yaml
	generators/input/sites/nancy/clusters/talc/nodes/talc-134.yaml
	generators/input/sites/nancy/clusters/talc/nodes/talc-22.yaml
	generators/input/sites/nancy/clusters/talc/nodes/talc-35.yaml
	generators/input/sites/nancy/clusters/talc/nodes/talc-70.yaml
	generators/input/sites/nancy/clusters/talc/talc.rb
	generators/input/sites/nancy/net-links/sgraoullyib.yaml
	generators/input/sites/nancy/net-links/sgriffonib.yaml
	generators/input/sites/nantes/clusters/econome/econome.rb
	generators/input/sites/reims/clusters/stremi/stremi.rb
	generators/input/sites/reims/clusters/stremi/stremi_manual.yaml
	generators/input/sites/rennes/clusters/paranoia/paranoia.rb
	generators/input/sites/rennes/clusters/parapide/parapide.rb
	generators/input/sites/rennes/clusters/parapluie/parapluie.rb
	generators/input/sites/rennes/clusters/parasilo/parasilo.rb
	generators/input/sites/rennes/clusters/parasilo/parasilo_manual.yaml
	generators/input/sites/rennes/clusters/paravance/paravance.rb
	generators/input/sites/sophia/clusters/sol/sol.rb
	generators/input/sites/sophia/clusters/suno/suno.rb
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-1.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-10.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-11.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-12.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-13.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-14.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-15.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-16.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-17.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-18.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-19.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-2.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-20.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-21.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-22.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-23.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-24.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-25.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-26.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-27.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-28.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-29.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-3.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-30.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-31.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-32.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-4.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-5.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-6.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-7.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-8.yaml
	input/grid5000/sites/nancy/clusters/mbi/nodes/mbi-9.yaml
	input/grid5000/sites/nancy/net-links/sgrelon1.yaml
	input/grid5000/sites/nancy/net-links/sgriffon2.yaml
	input/grid5000/sites/nancy/net-links/sgriffon3.yaml
	input/grid5000/sites/nancy/net-links/sgriffonib.yaml
	input/grid5000/sites/nancy/net-links/smbi1.yaml
	input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
	input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.yaml
	input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.yaml
	input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
	input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-1.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-10.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-100.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-101.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-102.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-103.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-104.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-105.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-106.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-107.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-108.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-109.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-11.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-110.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-111.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-112.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-113.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-114.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-115.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-116.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-117.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-118.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-119.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-12.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-120.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-121.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-122.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-123.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-124.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-125.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-126.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-127.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-128.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-129.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-13.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-130.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-131.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-132.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-133.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-134.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-135.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-136.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-137.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-138.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-139.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-14.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-140.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-15.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-16.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-17.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-18.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-19.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-2.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-20.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-21.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-22.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-23.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-24.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-25.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-26.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-27.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-28.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-29.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-3.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-30.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-31.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-32.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-33.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-34.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-35.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-36.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-37.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-38.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-39.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-4.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-40.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-41.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-42.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-43.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-44.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-45.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-46.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-47.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-48.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-49.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-5.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-50.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-51.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-52.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-53.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-54.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-55.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-56.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-57.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-58.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-59.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-6.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-60.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-61.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-62.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-63.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-64.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-65.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-66.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-67.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-68.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-69.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-7.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-70.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-71.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-72.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-73.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-74.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-75.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-76.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-77.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-78.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-79.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-8.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-80.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-81.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-82.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-83.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-84.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-85.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-86.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-87.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-88.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-89.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-9.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-90.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-91.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-92.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-93.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-94.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-95.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-96.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-97.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-98.yaml
	input/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-99.yaml
	input/grid5000/sites/toulouse/net-links/gw-toulouse.yaml
	input/grid5000/sites/toulouse/net-links/r4.yaml
	input/grid5000/sites/toulouse/toulouse.rb
parents be4e6cff bd5e1957

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
......@@ -7,6 +7,9 @@
{
"uid": "renater-bordeaux"
},
{
"uid": "renater-rennes"
},
{
"kind": "router",
"site_uid": "nantes",
......
......@@ -12,9 +12,6 @@
},
{
"uid": "renater-nancy"
},
{
"uid": "renater-rennes"
}
]
}
......
......@@ -5,7 +5,7 @@
"rate": 10000000000,
"ports": [
{
"uid": "renater-paris"
"uid": "renater-nantes"
},
{
"kind": "router",
......
......@@ -8,9 +8,6 @@
"uid": "renater-marseille"
},
{
"kind": "router",
"site_uid": "toulouse",
"uid": "gw-toulouse"
}
]
}
......
......@@ -2,7 +2,10 @@
"created_at": "Wed, 01 Sep 2010 22:00:00 GMT",
"kavlan": true,
"model": "Bull R422-E2 dual mobo + Tesla S1070",
"production": true,
"queues": [
"default",
"admin"
],
"type": "cluster",
"uid": "adonis"
}
\ No newline at end of file
......@@ -24,6 +24,9 @@
"ram_size": 25769803776,
"virtual_size": null
},
"monitoring": {
"wattmeter": "shared"
},
"network_adapters": [
{
"bridged": true,
......@@ -119,18 +122,18 @@
"pdu": [
[
{
"measure": "outlet-11",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
"port": "outlet-11",
"uid": "adonis-pdu-1"
},
{
"measure": "outlet-12",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
"port": "outlet-12",
"uid": "adonis-pdu-1"
}
],
[
{
"measure": "global",
"uid": "block-1"
"measure": "block-1",
"uid": "adonis-pdu-1"
}
]
]
......@@ -143,7 +146,7 @@
"driver": "ahci",
"interface": "SATA",
"model": "WDC WD2502ABYS-0",
"rev": 2.0,
"rev": 3.0,
"size": 251059544064,
"storage": "HDD",
"vendor": "Western Digital"
......@@ -152,6 +155,11 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"queues": [
"default",
"admin"
],
"virtual": "ivt"
},
"type": "node",
......
......@@ -24,6 +24,9 @@
"ram_size": 25769803776,
"virtual_size": null
},
"monitoring": {
"wattmeter": "shared"
},
"network_adapters": [
{
"bridged": true,
......@@ -119,18 +122,18 @@
"pdu": [
[
{
"measure": "outlet-13",
"uid": "adonis-pdu-2.grenoble.grid5000.fr"
"port": "outlet-13",
"uid": "adonis-pdu-2"
},
{
"measure": "outlet-14",
"uid": "adonis-pdu-2.grenoble.grid5000.fr"
"port": "outlet-14",
"uid": "adonis-pdu-2"
}
],
[
{
"measure": "global",
"uid": "block-2"
"measure": "block-2",
"uid": "adonis-pdu-2"
}
]
]
......@@ -143,7 +146,7 @@
"driver": "ahci",
"interface": "SATA",
"model": "WDC WD2502ABYS-0",
"rev": 2.0,
"rev": 3.0,
"size": 251059544064,
"storage": "HDD",
"vendor": "Western Digital"
......@@ -152,6 +155,11 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"queues": [
"default",
"admin"
],
"virtual": "ivt"
},
"type": "node",
......
......@@ -24,6 +24,9 @@
"ram_size": 25769803776,
"virtual_size": null
},
"monitoring": {
"wattmeter": "shared"
},
"network_adapters": [
{
"bridged": true,
......@@ -119,18 +122,18 @@
"pdu": [
[
{
"measure": "outlet-11",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
"port": "outlet-11",
"uid": "adonis-pdu-1"
},
{
"measure": "outlet-12",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
"port": "outlet-12",
"uid": "adonis-pdu-1"
}
],
[
{
"measure": "global",
"uid": "block-1"
"measure": "block-1",
"uid": "adonis-pdu-1"
}
]
]
......@@ -143,7 +146,7 @@
"driver": "ahci",
"interface": "SATA",
"model": "WDC WD2502ABYS-0",
"rev": 2.0,
"rev": 3.0,
"size": 251059544064,
"storage": "HDD",
"vendor": "Western Digital"
......@@ -152,6 +155,11 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"queues": [
"default",
"admin"
],
"virtual": "ivt"
},
"type": "node",
......
......@@ -24,6 +24,9 @@
"ram_size": 25769803776,
"virtual_size": null
},
"monitoring": {
"wattmeter": "shared"
},
"network_adapters": [
{
"bridged": true,
......@@ -119,18 +122,18 @@
"pdu": [
[
{
"measure": "outlet-13",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
"port": "outlet-13",
"uid": "adonis-pdu-1"
},
{
"measure": "outlet-14",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
"port": "outlet-14",
"uid": "adonis-pdu-1"
}
],
[
{
"measure": "global",
"uid": "block-2"
"measure": "block-2",
"uid": "adonis-pdu-1"
}
]
]
......@@ -143,7 +146,7 @@
"driver": "ahci",
"interface": "SATA",
"model": "WDC WD2502ABYS-0",
"rev": 2.0,
"rev": 3.0,
"size": 251059544064,
"storage": "HDD",
"vendor": "Western Digital"
......@@ -152,6 +155,11 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"queues": [
"default",
"admin"
],
"virtual": "ivt"
},
"type": "node",
......
......@@ -24,6 +24,9 @@
"ram_size": 25769803776,
"virtual_size": null
},
"monitoring": {
"wattmeter": "shared"
},
"network_adapters": [
{
"bridged": true,
......@@ -119,18 +122,18 @@
"pdu": [
[
{
"measure": "outlet-13",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
"port": "outlet-13",
"uid": "adonis-pdu-1"
},
{
"measure": "outlet-14",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
"port": "outlet-14",
"uid": "adonis-pdu-1"
}
],
[
{
"measure": "global",
"uid": "block-2"
"measure": "block-2",
"uid": "adonis-pdu-1"
}
]
]
......@@ -143,7 +146,7 @@
"driver": "ahci",
"interface": "SATA",
"model": "WDC WD2502ABYS-0",
"rev": 2.0,
"rev": 3.0,
"size": 251059544064,
"storage": "HDD",
"vendor": "Western Digital"
......@@ -152,6 +155,11 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"queues": [
"default",
"admin"
],
"virtual": "ivt"
},
"type": "node",
......
......@@ -24,6 +24,9 @@
"ram_size": 25769803776,
"virtual_size": null
},
"monitoring": {
"wattmeter": "shared"
},
"network_adapters": [
{
"bridged": true,
......@@ -119,18 +122,18 @@
"pdu": [
[
{
"measure": "outlet-5",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
"port": "outlet-5",
"uid": "adonis-pdu-1"
},
{
"measure": "outlet-6",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
"port": "outlet-6",
"uid": "adonis-pdu-1"
}
],
[
{
"measure": "global",
"uid": "block-1"
"measure": "block-1",
"uid": "adonis-pdu-1"
}
]
]
......@@ -143,7 +146,7 @@
"driver": "ahci",
"interface": "SATA",
"model": "WDC WD2502ABYS-0",
"rev": 2.0,
"rev": 3.0,
"size": 251059544064,
"storage": "HDD",
"vendor": "Western Digital"
......@@ -152,6 +155,11 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"queues": [
"default",
"admin"
],
"virtual": "ivt"
},
"type": "node",
......
......@@ -24,6 +24,9 @@
"ram_size": 25769803776,
"virtual_size": null
},
"monitoring": {
"wattmeter": "shared"
},
"network_adapters": [
{
"bridged": true,
......@@ -119,18 +122,18 @@
"pdu": [
[
{
"measure": "outlet-5",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
"port": "outlet-5",
"uid": "adonis-pdu-1"
},
{
"measure": "outlet-6",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
"port": "outlet-6",
"uid": "adonis-pdu-1"
}
],
[
{
"measure": "global",
"uid": "block-1"
"measure": "block-1",
"uid": "adonis-pdu-1"
}
]
]
......@@ -143,7 +146,7 @@
"driver": "ahci",
"interface": "SATA",
"model": "WDC WD2502ABYS-0",
"rev": 2.0,
"rev": 3.0,
"size": 251059544064,
"storage": "HDD",
"vendor": "Western Digital"
......@@ -152,6 +155,11 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"queues": [
"default",
"admin"
],
"virtual": "ivt"
},
"type": "node",
......
......@@ -24,6 +24,9 @@
"ram_size": 25769803776,
"virtual_size": null
},
"monitoring": {
"wattmeter": "shared"
},
"network_adapters": [
{
"bridged": true,
......@@ -119,18 +122,18 @@
"pdu": [
[
{
"measure": "outlet-1",
"uid": "adonis-pdu-2.grenoble.grid5000.fr"
"port": "outlet-1",
"uid": "adonis-pdu-2"
},
{
"measure": "outlet-2",
"uid": "adonis-pdu-2.grenoble.grid5000.fr"
"port": "outlet-2",
"uid": "adonis-pdu-2"
}
],
[
{
"measure": "global",
"uid": "block-1"
"measure": "block-1",
"uid": "adonis-pdu-2"
}
]
]
......@@ -143,7 +146,7 @@
"driver": "ahci",
"interface": "SATA",
"model": "WDC WD2502ABYS-0",
"rev": 2.0,
"rev": 3.0,
"size": 251059544064,
"storage": "HDD",
"vendor": "Western Digital"
......@@ -152,6 +155,11 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"queues": [
"default",
"admin"
],
"virtual": "ivt"
},
"type": "node",
......
......@@ -24,6 +24,9 @@
"ram_size": 25769803776,
"virtual_size": null
},
"monitoring": {
"wattmeter": "shared"
},
"network_adapters": [
{
"bridged": true,
......@@ -119,18 +122,18 @@
"pdu": [
[
{
"measure": "outlet-1",
"uid": "adonis-pdu-2.grenoble.grid5000.fr"
"port": "outlet-1",
"uid": "adonis-pdu-2"
},
{
"measure": "outlet-2",
"uid": "adonis-pdu-2.grenoble.grid5000.fr"
"port": "outlet-2",
"uid": "adonis-pdu-2"
}
],
[
{
"measure": "global",
"uid": "block-1"
"measure": "block-1",
"uid": "adonis-pdu-2"
}
]
]
......@@ -143,7 +146,7 @@
"driver": "ahci",
"interface": "SATA",
"model": "WDC WD2502ABYS-0",
"rev": 2.0,
"rev": 3.0,
"size": 251059544064,
"storage": "HDD",
"vendor": "Western Digital"
......@@ -152,6 +155,11 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"queues": [
"default",
"admin"
],
"virtual": "ivt"
},
"type": "node",
......
......@@ -24,6 +24,9 @@
"ram_size": 25769803776,
"virtual_size": null
},
"monitoring": {
"wattmeter": "shared"
},
"network_adapters": [
{
"bridged": true,
......@@ -119,18 +122,18 @@
"pdu": [
[
{
"measure": "outlet-13",
"uid": "adonis-pdu-2.grenoble.grid5000.fr"
"port": "outlet-13",
"uid": "adonis-pdu-2"