diff --git a/dev/input/grid5000/sites/grenoble/clusters/adonis/adonis.yaml b/dev/input/grid5000/sites/grenoble/clusters/adonis/adonis.yaml index 0dbb3ef188d6f5f5ef52872875e10b3b28c68ca0..6eff00a9feef173efe9f207538d8e9cf5f27654d 100644 --- a/dev/input/grid5000/sites/grenoble/clusters/adonis/adonis.yaml +++ b/dev/input/grid5000/sites/grenoble/clusters/adonis/adonis.yaml @@ -75,7 +75,7 @@ nodes: gpu_count: 2 gpu_vendor: Nvidia gpu_model: Tesla-C1060 - + adonis-1: chassis: serial: '1234567890' diff --git a/dev/input/grid5000/sites/grenoble/clusters/adonis/adonis_manual.yaml b/dev/input/grid5000/sites/grenoble/clusters/adonis/adonis_extra.yaml similarity index 90% rename from dev/input/grid5000/sites/grenoble/clusters/adonis/adonis_manual.yaml rename to dev/input/grid5000/sites/grenoble/clusters/adonis/adonis_extra.yaml index 5674f497b56846334aaad34d9319260934f96a35..09ef2838e6fbd595c7d1ee1f7ad5b6d053735e2c 100644 --- a/dev/input/grid5000/sites/grenoble/clusters/adonis/adonis_manual.yaml +++ b/dev/input/grid5000/sites/grenoble/clusters/adonis/adonis_extra.yaml @@ -21,10 +21,6 @@ nodes: - # this node contributes to the following power consumption measure - uid: adonis-pdu-1 measure: block-1 - gpu: - gpu_count: 2 - gpu_vendor: Nvidia - gpu_model: Tesla-C1060 adonis-2: network_adapters: eth0: @@ -40,10 +36,6 @@ nodes: - - uid: adonis-pdu-1 measure: block-1 - gpu: - gpu_count: 2 - gpu_vendor: Nvidia - gpu_model: Tesla-C1060 adonis-3: network_adapters: eth0: @@ -58,10 +50,6 @@ nodes: - - uid: adonis-pdu-1 measure: block-2 - gpu: - gpu_count: 2 - gpu_vendor: Nvidia - gpu_model: Tesla-C1060 adonis-4: network_adapters: eth0: @@ -76,10 +64,6 @@ nodes: - - uid: adonis-pdu-1 measure: block-2 - gpu: - gpu_count: 2 - gpu_vendor: Nvidia - gpu_model: Tesla-C1060 adonis-5: network_adapters: eth0: diff --git a/dev/input/grid5000/sites/grenoble/clusters/edel/edel_manual.yaml b/dev/input/grid5000/sites/grenoble/clusters/edel/edel_network.yaml similarity index 100% rename from dev/input/grid5000/sites/grenoble/clusters/edel/edel_manual.yaml rename to dev/input/grid5000/sites/grenoble/clusters/edel/edel_network.yaml diff --git a/dev/input/grid5000/sites/grenoble/clusters/genepi/genepi_manual.yaml b/dev/input/grid5000/sites/grenoble/clusters/genepi/genepi_network.yaml similarity index 100% rename from dev/input/grid5000/sites/grenoble/clusters/genepi/genepi_manual.yaml rename to dev/input/grid5000/sites/grenoble/clusters/genepi/genepi_network.yaml diff --git a/dev/input/grid5000/sites/lille/clusters/chimint/chimint_manual.yaml b/dev/input/grid5000/sites/lille/clusters/chimint/chimint_network.yaml similarity index 100% rename from dev/input/grid5000/sites/lille/clusters/chimint/chimint_manual.yaml rename to dev/input/grid5000/sites/lille/clusters/chimint/chimint_network.yaml diff --git a/dev/input/grid5000/sites/lille/clusters/chirloute/chirloute.yaml b/dev/input/grid5000/sites/lille/clusters/chirloute/chirloute.yaml index 2e70c8825391c26cfeb573a07a8de2a455c00d49..35cb9ca8d67d66b41430c8c5d40c119a70e8c371 100644 --- a/dev/input/grid5000/sites/lille/clusters/chirloute/chirloute.yaml +++ b/dev/input/grid5000/sites/lille/clusters/chirloute/chirloute.yaml @@ -76,6 +76,10 @@ nodes: version: 1.14 gpu: gpu: shared + gpu_count: 4 + gpu_vendor: Nvidia + gpu_model: Tesla-S2050 + monitoring: wattmeter: false diff --git a/dev/input/grid5000/sites/lille/clusters/chirloute/chirloute_manual.yaml b/dev/input/grid5000/sites/lille/clusters/chirloute/chirloute_manual.yaml deleted file mode 100644 index 7c6a00ff90c5b9b0efa19755478f0a6a60973d19..0000000000000000000000000000000000000000 --- a/dev/input/grid5000/sites/lille/clusters/chirloute/chirloute_manual.yaml +++ /dev/null @@ -1,67 +0,0 @@ ---- -nodes: - chirloute-1: - network_adapters: - eth1: - switch_port: Gi4/25 - gpu: - gpu_count: 4 - gpu_vendor: Nvidia - gpu_model: Tesla-S2050 - chirloute-2: - network_adapters: - eth1: - switch_port: Gi3/25 - gpu: - gpu_count: 4 - gpu_vendor: Nvidia - gpu_model: Tesla-S2050 - chirloute-3: - network_adapters: - eth1: - switch_port: Gi4/44 - gpu: - gpu_count: 4 - gpu_vendor: Nvidia - gpu_model: Tesla-S2050 - chirloute-4: - network_adapters: - eth1: - switch_port: Gi3/26 - gpu: - gpu_count: 4 - gpu_vendor: Nvidia - gpu_model: Tesla-S2050 - chirloute-5: - network_adapters: - eth1: - switch_port: Gi4/23 - gpu: - gpu_count: 4 - gpu_vendor: Nvidia - gpu_model: Tesla-S2050 - chirloute-6: - network_adapters: - eth1: - switch_port: Gi3/31 - gpu: - gpu_count: 4 - gpu_vendor: Nvidia - gpu_model: Tesla-S2050 - chirloute-7: - network_adapters: - eth1: - switch_port: Gi4/23 - gpu: - gpu_count: 4 - gpu_vendor: Nvidia - gpu_model: Tesla-S2050 - chirloute-8: - network_adapters: - eth1: - switch_port: Gi3/32 - gpu: - gpu_count: 4 - gpu_vendor: Nvidia - gpu_model: Tesla-S2050 - diff --git a/dev/input/grid5000/sites/lille/clusters/chirloute/chirloute_network.yaml b/dev/input/grid5000/sites/lille/clusters/chirloute/chirloute_network.yaml new file mode 100644 index 0000000000000000000000000000000000000000..8c88d935560d294fc6b866999d06b16d53baea05 --- /dev/null +++ b/dev/input/grid5000/sites/lille/clusters/chirloute/chirloute_network.yaml @@ -0,0 +1,35 @@ +--- +nodes: + chirloute-1: + network_adapters: + eth1: + switch_port: Gi4/25 + chirloute-2: + network_adapters: + eth1: + switch_port: Gi3/25 + chirloute-3: + network_adapters: + eth1: + switch_port: Gi4/44 + chirloute-4: + network_adapters: + eth1: + switch_port: Gi3/26 + chirloute-5: + network_adapters: + eth1: + switch_port: Gi4/23 + chirloute-6: + network_adapters: + eth1: + switch_port: Gi3/31 + chirloute-7: + network_adapters: + eth1: + switch_port: Gi4/23 + chirloute-8: + network_adapters: + eth1: + switch_port: Gi3/32 + diff --git a/dev/input/grid5000/sites/luxembourg/clusters/granduc/granduc_manual.yaml b/dev/input/grid5000/sites/luxembourg/clusters/granduc/granduc_network.yaml similarity index 100% rename from dev/input/grid5000/sites/luxembourg/clusters/granduc/granduc_manual.yaml rename to dev/input/grid5000/sites/luxembourg/clusters/granduc/granduc_network.yaml diff --git a/dev/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml b/dev/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml index 2931890edcc6cb1ba70954f7ce86e51197bc1ccf..b47bbd92274af4d9b0e260b3eb79a080bb222fa7 100644 --- a/dev/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml +++ b/dev/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml @@ -11,6 +11,9 @@ nodes: kernel: 3.16.0-4-amd64 name: debian version: '8.2' + chassis: + manufacturer: Dell Inc. + name: PowerEdge M620 processor: cache_l1d: 32768 cache_l1i: 32768 diff --git a/dev/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_manual.yaml b/dev/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_extra.yaml similarity index 77% rename from dev/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_manual.yaml rename to dev/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_extra.yaml index 29f0677d9efe68fa3fdd4273edb23847540ee397..16dcf38fc1062e1ad5386ac857aabf2c88986a96 100644 --- a/dev/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_manual.yaml +++ b/dev/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_extra.yaml @@ -3,8 +3,6 @@ nodes: petitprince-1: chassis: serial: 1NVTG5J - manufacturer: Dell Inc. - name: PowerEdge M620 network_adapters: eth0: switch_port: Te0/1 @@ -15,8 +13,6 @@ nodes: petitprince-2: chassis: serial: 2MVTG5J - manufacturer: Dell Inc. - name: PowerEdge M620 network_adapters: eth0: switch_port: Te0/2 @@ -27,8 +23,6 @@ nodes: petitprince-3: chassis: serial: 3MVTG5J - manufacturer: Dell Inc. - name: PowerEdge M620 network_adapters: eth0: switch_port: Te0/3 @@ -39,8 +33,6 @@ nodes: petitprince-4: chassis: serial: 4MVTG5J - manufacturer: Dell Inc. - name: PowerEdge M620 network_adapters: eth0: switch_port: Te0/4 @@ -51,8 +43,6 @@ nodes: petitprince-5: chassis: serial: 5MVTG5J - manufacturer: Dell Inc. - name: PowerEdge M620 network_adapters: eth0: switch_port: Te0/5 @@ -63,8 +53,6 @@ nodes: petitprince-6: chassis: serial: 6MVTG5J - manufacturer: Dell Inc. - name: PowerEdge M620 network_adapters: eth0: switch_port: Te0/6 @@ -75,8 +63,6 @@ nodes: petitprince-7: chassis: serial: 7MVTG5J - manufacturer: Dell Inc. - name: PowerEdge M620 network_adapters: eth0: switch_port: Te0/7 @@ -87,8 +73,6 @@ nodes: petitprince-8: chassis: serial: 8MVTG5J - manufacturer: Dell Inc. - name: PowerEdge M620 network_adapters: eth0: switch_port: Te0/8 @@ -99,8 +83,6 @@ nodes: petitprince-9: chassis: serial: 9MVTG5J - manufacturer: Dell Inc. - name: PowerEdge M620 network_adapters: eth0: switch_port: Te0/9 @@ -111,8 +93,6 @@ nodes: petitprince-10: chassis: serial: BMVTG5J - manufacturer: Dell Inc. - name: PowerEdge M620 network_adapters: eth0: switch_port: Te0/10 @@ -123,8 +103,6 @@ nodes: petitprince-11: chassis: serial: CMVTG5J - manufacturer: Dell Inc. - name: PowerEdge M620 network_adapters: eth0: switch_port: Te0/11 @@ -135,8 +113,6 @@ nodes: petitprince-12: chassis: serial: DMVTG5J - manufacturer: Dell Inc. - name: PowerEdge M620 network_adapters: eth0: switch_port: Te0/12 @@ -147,8 +123,6 @@ nodes: petitprince-13: chassis: serial: FMVTG5J - manufacturer: Dell Inc. - name: PowerEdge M620 network_adapters: eth0: switch_port: Te0/13 @@ -159,8 +133,6 @@ nodes: petitprince-14: chassis: serial: GMVTG5J - manufacturer: Dell Inc. - name: PowerEdge M620 network_adapters: eth0: switch_port: Te0/14 @@ -171,8 +143,6 @@ nodes: petitprince-15: chassis: serial: HMVTG5J - manufacturer: Dell Inc. - name: PowerEdge M620 network_adapters: eth0: switch_port: Te0/15 @@ -183,8 +153,6 @@ nodes: petitprince-16: chassis: serial: JMVTG5J - manufacturer: Dell Inc. - name: PowerEdge M620 network_adapters: eth0: switch_port: Te0/16 diff --git a/dev/input/grid5000/sites/nancy/clusters/graphene/graphene_manual.yaml b/dev/input/grid5000/sites/nancy/clusters/graphene/graphene_extra.yaml similarity index 100% rename from dev/input/grid5000/sites/nancy/clusters/graphene/graphene_manual.yaml rename to dev/input/grid5000/sites/nancy/clusters/graphene/graphene_extra.yaml diff --git a/dev/input/grid5000/sites/nancy/clusters/graphite/graphite_manual.yaml b/dev/input/grid5000/sites/nancy/clusters/graphite/graphite_extra.yaml similarity index 100% rename from dev/input/grid5000/sites/nancy/clusters/graphite/graphite_manual.yaml rename to dev/input/grid5000/sites/nancy/clusters/graphite/graphite_extra.yaml diff --git a/dev/input/grid5000/sites/nancy/clusters/griffon/griffon_manual.yaml b/dev/input/grid5000/sites/nancy/clusters/griffon/griffon_extra.yaml similarity index 100% rename from dev/input/grid5000/sites/nancy/clusters/griffon/griffon_manual.yaml rename to dev/input/grid5000/sites/nancy/clusters/griffon/griffon_extra.yaml diff --git a/dev/input/grid5000/sites/nancy/clusters/grimoire/grimoire_manual.yaml b/dev/input/grid5000/sites/nancy/clusters/grimoire/grimoire_pdu.yaml similarity index 100% rename from dev/input/grid5000/sites/nancy/clusters/grimoire/grimoire_manual.yaml rename to dev/input/grid5000/sites/nancy/clusters/grimoire/grimoire_pdu.yaml diff --git a/dev/input/grid5000/sites/nancy/clusters/grisou/grisou_manual.yaml b/dev/input/grid5000/sites/nancy/clusters/grisou/grisou_pdu.yaml similarity index 100% rename from dev/input/grid5000/sites/nancy/clusters/grisou/grisou_manual.yaml rename to dev/input/grid5000/sites/nancy/clusters/grisou/grisou_pdu.yaml diff --git a/dev/input/grid5000/sites/nantes/clusters/econome/econome_manual.yaml b/dev/input/grid5000/sites/nantes/clusters/econome/econome_network.yaml similarity index 100% rename from dev/input/grid5000/sites/nantes/clusters/econome/econome_manual.yaml rename to dev/input/grid5000/sites/nantes/clusters/econome/econome_network.yaml diff --git a/dev/input/grid5000/sites/reims/clusters/stremi/stremi_manual.yaml b/dev/input/grid5000/sites/reims/clusters/stremi/stremi_extra.yaml similarity index 100% rename from dev/input/grid5000/sites/reims/clusters/stremi/stremi_manual.yaml rename to dev/input/grid5000/sites/reims/clusters/stremi/stremi_extra.yaml diff --git a/dev/input/grid5000/sites/rennes/clusters/paranoia/paranoia_manual.yaml b/dev/input/grid5000/sites/rennes/clusters/paranoia/paranoia_network.yaml similarity index 100% rename from dev/input/grid5000/sites/rennes/clusters/paranoia/paranoia_manual.yaml rename to dev/input/grid5000/sites/rennes/clusters/paranoia/paranoia_network.yaml diff --git a/dev/input/grid5000/sites/rennes/clusters/parapide/parapide_manual.yaml b/dev/input/grid5000/sites/rennes/clusters/parapide/parapide_extra.yaml similarity index 100% rename from dev/input/grid5000/sites/rennes/clusters/parapide/parapide_manual.yaml rename to dev/input/grid5000/sites/rennes/clusters/parapide/parapide_extra.yaml diff --git a/dev/input/grid5000/sites/rennes/clusters/parapluie/parapluie_manual.yaml b/dev/input/grid5000/sites/rennes/clusters/parapluie/parapluie_extra.yaml similarity index 100% rename from dev/input/grid5000/sites/rennes/clusters/parapluie/parapluie_manual.yaml rename to dev/input/grid5000/sites/rennes/clusters/parapluie/parapluie_extra.yaml diff --git a/dev/input/grid5000/sites/rennes/clusters/parasilo/parasilo_manual.yaml b/dev/input/grid5000/sites/rennes/clusters/parasilo/parasilo_pdu.yaml similarity index 100% rename from dev/input/grid5000/sites/rennes/clusters/parasilo/parasilo_manual.yaml rename to dev/input/grid5000/sites/rennes/clusters/parasilo/parasilo_pdu.yaml diff --git a/dev/input/grid5000/sites/rennes/clusters/paravance/paravance_manual.yaml b/dev/input/grid5000/sites/rennes/clusters/paravance/paravance_pdu.yaml similarity index 100% rename from dev/input/grid5000/sites/rennes/clusters/paravance/paravance_manual.yaml rename to dev/input/grid5000/sites/rennes/clusters/paravance/paravance_pdu.yaml diff --git a/dev/input/grid5000/sites/sophia/clusters/sol/sol_manual.yaml b/dev/input/grid5000/sites/sophia/clusters/sol/sol_network.yaml similarity index 100% rename from dev/input/grid5000/sites/sophia/clusters/sol/sol_manual.yaml rename to dev/input/grid5000/sites/sophia/clusters/sol/sol_network.yaml diff --git a/dev/input/grid5000/sites/sophia/clusters/suno/suno_manual.yaml b/dev/input/grid5000/sites/sophia/clusters/suno/suno_network.yaml similarity index 100% rename from dev/input/grid5000/sites/sophia/clusters/suno/suno_manual.yaml rename to dev/input/grid5000/sites/sophia/clusters/suno/suno_network.yaml