October 2020 - Compass-ci - mailweb.openeuler.org

[PATCH v6 compass-ci] add queue field into job.yaml
by Xiao Shenwei 29 Oct '20

29 Oct '20

use queue field decide which queue to enter queue field come from user's specify(job.yaml) or dafault Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- src/lib/job.cr | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/lib/job.cr b/src/lib/job.cr index 8f5dd36..7fbc414 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -73,6 +73,7 @@ class Job tbox_group testbox lab + queue initrd_pkg initrd_deps initrds_uri @@ -139,6 +140,7 @@ class Job set_kernel_params() set_lkp_server() set_sshr_port() + set_queue() end private def append_init_field @@ -199,6 +201,16 @@ class Job self["result_service"] = "raw_upload" end + private def set_queue + return if @hash.has_key?("queue") + + # set default value + self["queue"] = tbox_group + if tbox_group.to_s.starts_with?(/(vm|dc)-/) + self["queue"] = "#{tbox_group}.#{arch}" + end + end + # if not assign tbox_group, set it to a match result from testbox # ?if job special testbox, should we just set tbox_group=textbox private def update_tbox_group_from_testbox -- 2.23.0

1 0

[PATCH compass-ci] sparrow/3-code: add centos in os file
by Zhang Yale 29 Oct '20

29 Oct '20

[Why] when run dev-env in centos system, error like this: ./dev-env:line 41: ./os/centos: No such file or directory. Signed-off-by: Zhang Yale <zhangyale3(a)huawei.com> --- sparrow/3-code/os/centos | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 sparrow/3-code/os/centos diff --git a/sparrow/3-code/os/centos b/sparrow/3-code/os/centos new file mode 100644 index 0000000..efb4fcb --- /dev/null +++ b/sparrow/3-code/os/centos @@ -0,0 +1,6 @@ +#!/bin/bash +cat >> /etc/default/docker <<EOF +DOCKER_OPTS="--dns 114.114.114.114" +EOF + +systemctl restart docker -- 2.23.0

4 6

[PATCH v2 compass-ci] LICENSE: add document license
by Bai Jing 29 Oct '20

29 Oct '20

Signed-off-by: Bai Jing <799286817(a)qq.com> --- LICENSES/CCBY-4.0 | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 LICENSES/CCBY-4.0 diff --git a/LICENSES/CCBY-4.0 b/LICENSES/CCBY-4.0 new file mode 100644 index 0000000..abaf8d0 --- /dev/null +++ b/LICENSES/CCBY-4.0 @@ -0,0 +1,4 @@ +Copyright (c) 2020 Huawei Technologies Co., Ltd. +Your copying, use, modification, and distribution of this document is subject to the Creative Commons Attribution-ShareAlike 4.0 International Public License ("CC BY-SA 4.0"). +For ease of understanding, you can visit https://creativecommons.org/licenses/by-sa/4.0/to learn about the outline of CC BY-SA 4.0(but not a substitute). +The complete agreement of CC BY-SA 4.0 can be obtained from the following website: https://creativecommons.org/licenses/by-sa/4.0/legalcode. -- 2.23.0

2 2

[PATCH lkp-tests] lib/job.rb: expand load hosts file
by Wei Jihui 28 Oct '20

28 Oct '20

load_yaml(yaml_file, template_context) if template_context is not nil, it will expand read the yaml. this will read "<< : hosts/$tbox_group" in hosts file. Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- lib/job.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/job.rb b/lib/job.rb index f24435a0..5c2c9517 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -305,7 +305,7 @@ class Job hosts_file = get_hosts_file if hosts_file - hwconfig = load_yaml(hosts_file, nil) + hwconfig = load_yaml(hosts_file, {}) @job[source_file_symkey(hosts_file)] = nil @job.merge!(hwconfig) { |_k, a, _b| a } # job's key/value has priority over hwconfig @load_hosts_done = true -- 2.23.0

1 0

[PATCH v4 compass-ci] fix: sched: add 2 fields into cluster state
by Ren Wen 28 Oct '20

28 Oct '20

[Why] 1) Each node will report it's infos (roles, ip, direct_ips, direct_macs) when running cluster job, so also add these 2 parameters into node state: "direct_ips", "direct_macs". Cluster test scripts needs "direct_server_ips" as server client's ip to connect to server to do a test. When request state is "roles_ip", return clients two variables: server, direct_server_ips. Clients will export them. 2) Alter funtion "get_ip"'s name and it's return value to fit for changes. Signed-off-by: Ren Wen <15991987063(a)163.com> --- src/lib/sched.cr | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index c32091f..4221b73 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -99,25 +99,30 @@ class Sched when "write_state" node_roles = env.params.query["node_roles"] node_ip = env.params.query["ip"] + direct_ips = env.params.query["direct_ips"] + direct_macs = env.params.query["direct_macs"] + update_cluster_state(cluster_id, job_id, "roles", node_roles) update_cluster_state(cluster_id, job_id, "ip", node_ip) + update_cluster_state(cluster_id, job_id, "direct_ips", direct_ips) + update_cluster_state(cluster_id, job_id, "direct_macs", direct_macs) when "roles_ip" role = "server" - server_ip = get_ip(cluster_id, role) - return "server=#{server_ip}" + role_state = get_role_state(cluster_id, role) + raise "Missing #{role} state in cluster state" unless role_state + return "server=#{role_state["ip"]}\n" \ + "direct_server_ips=#{role_state["direct_ips"]}" end # show cluster state return @redis.hash_get("sched/cluster_state", cluster_id) end - # get the ip of role from cluster_state - def get_ip(cluster_id, role) + # get the node state of role from cluster_state + private def get_role_state(cluster_id, role) cluster_state = get_cluster_state(cluster_id) - cluster_state.each_value do |config| - if %(#{config["roles"]}) == role - return config["ip"] - end + cluster_state.each_value do |role_state| + return role_state if role_state["roles"] == role end end -- 2.23.0

1 0

[PATCH compass-ci] container/srv-http: add new web directory
by Cui Yili 28 Oct '20

28 Oct '20

[why] The "/srv/initrd/qemu-image/" directory needs to be accessible through the web to obtain qemu image. [how] docker start add "-v /srv/initrd/qemu-image:/srv/initrd/qemu-image:ro" Signed-off-by: cuiyili <2268260388(a)qq.com> --- container/srv-http/start | 1 + 1 file changed, 1 insertion(+) diff --git a/container/srv-http/start b/container/srv-http/start index 2b5bd1d..b56fe4d 100755 --- a/container/srv-http/start +++ b/container/srv-http/start @@ -13,6 +13,7 @@ cmd=( -v /srv/pub:/srv/pub:ro -v /etc/localtime:/etc/localtime:ro -v /srv/result:/srv/result:ro + -v /srv/initrd/qemu-image:/srv/initrd/qemu-image:ro -d srv-http ) -- 2.23.0

1 0

[PATCH compass-ci] container/fluentd: renamed master-fluentd
by Wu Zhende 28 Oct '20

28 Oct '20

[Why] Now, we have "sub-fluentd" and "fluentd". "fluentd" doesn't show the relationship well. Use "sub-fluentd" and "master-fluentd" can ben better. "sub-fluentd" send logs to "master-fluentd". And use MASTER_FLUENTD_HOST(PORT) replace FLUENTD_SERVER_HOST(PORT). When we see MASTER_FLUENTD_HOST can know it means master-fluentd's host Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- container/{fluentd => master-fluentd}/Dockerfile | 0 container/{fluentd => master-fluentd}/build | 0 container/{fluentd => master-fluentd}/build-depends | 0 .../{fluentd => master-fluentd}/docker-fluentd.conf | 0 container/{fluentd => master-fluentd}/start | 0 container/scheduler/start | 10 +++++----- container/sub-fluentd/docker-fluentd.conf | 8 ++++---- container/sub-fluentd/start | 8 ++++---- sparrow/3-code/dev-env | 8 ++++---- src/lib/sched.cr | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) rename container/{fluentd => master-fluentd}/Dockerfile (100%) rename container/{fluentd => master-fluentd}/build (100%) rename container/{fluentd => master-fluentd}/build-depends (100%) rename container/{fluentd => master-fluentd}/docker-fluentd.conf (100%) rename container/{fluentd => master-fluentd}/start (100%) diff --git a/container/fluentd/Dockerfile b/container/master-fluentd/Dockerfile similarity index 100% rename from container/fluentd/Dockerfile rename to container/master-fluentd/Dockerfile diff --git a/container/fluentd/build b/container/master-fluentd/build similarity index 100% rename from container/fluentd/build rename to container/master-fluentd/build diff --git a/container/fluentd/build-depends b/container/master-fluentd/build-depends similarity index 100% rename from container/fluentd/build-depends rename to container/master-fluentd/build-depends diff --git a/container/fluentd/docker-fluentd.conf b/container/master-fluentd/docker-fluentd.conf similarity index 100% rename from container/fluentd/docker-fluentd.conf rename to container/master-fluentd/docker-fluentd.conf diff --git a/container/fluentd/start b/container/master-fluentd/start similarity index 100% rename from container/fluentd/start rename to container/master-fluentd/start diff --git a/container/scheduler/start b/container/scheduler/start index 8ca12f0..6898d4b 100755 --- a/container/scheduler/start +++ b/container/scheduler/start @@ -20,8 +20,8 @@ names = Set.new %w[ TASKQUEUE_PORT TASKQUEUE_HOST GIT_SERVER - FLUENTD_SERVER_HOST - FLUENTD_SERVER_PORT + MASTER_FLUENTD_HOST + MASTER_FLUENTD_PORT SSHR_PORT SSHR_PORT_BASE SSHR_PORT_LEN @@ -40,7 +40,7 @@ DEFAULT_CCI = "#{CCI_REPOS}/compass-ci" LAB = defaults['lab'] || 'z9' SCHED_PORT = defaults['SCHED_PORT'] || '3000' SCHED_HOST = defaults['SCHED_HOST'] || '172.17.0.1' -FLUENTD_SERVER_PORT = defaults['FLUENTD_SERVER_PORT'] || '24224' +MASTER_FLUENTD_PORT = defaults['MASTER_FLUENTD_PORT'] || '24224' DEFAULT_CONFIG_DIR = '/etc/compass-ci/defaults' docker_rm "s001-alpine-#{SCHED_PORT}" @@ -64,8 +64,8 @@ cmd = %W[ -e SCHED_HOST=#{SCHED_HOST} -e SCHED_PORT=#{SCHED_PORT} -e GIT_SERVER=#{defaults["GIT_SERVER"]} - -e FLUENTD_SERVER_HOST=#{defaults["FLUENTD_SERVER_HOST"]} - -e FLUENTD_SERVER_PORT=#{FLUENTD_SERVER_PORT} + -e MASTER_FLUENTD_HOST=#{defaults["MASTER_FLUENTD_HOST"]} + -e MASTER_FLUENTD_PORT=#{MASTER_FLUENTD_PORT} -v #{ENV['LKP_SRC']}:#{DEFAULT_LKP} -v #{ENV['CCI_SRC']}:#{DEFAULT_CCI} -v #{DEFAULT_CONFIG_DIR}:#{DEFAULT_CONFIG_DIR}:ro diff --git a/container/sub-fluentd/docker-fluentd.conf b/container/sub-fluentd/docker-fluentd.conf index 0092982..c674fb1 100644 --- a/container/sub-fluentd/docker-fluentd.conf +++ b/container/sub-fluentd/docker-fluentd.conf @@ -21,8 +21,8 @@ keepalive true <server> name myserver - host "#{ENV['FLUENTD_SERVER_HOST']}" - port "#{ENV['FLUENTD_SERVER_PORT']}" + host "#{ENV['MASTER_FLUENTD_HOST']}" + port "#{ENV['MASTER_FLUENTD_PORT']}" </server> <buffer tag> chunk_limit_size 1M @@ -62,8 +62,8 @@ hard_timeout 60 <server> master-fluentd - host "#{ENV['FLUENTD_SERVER_HOST']}" - port "#{ENV['FLUENTD_SERVER_PORT']}" + host "#{ENV['MASTER_FLUENTD_HOST']}" + port "#{ENV['MASTER_FLUENTD_PORT']}" </server> </store> </match> diff --git a/container/sub-fluentd/start b/container/sub-fluentd/start index 53a74c4..adbfbc3 100755 --- a/container/sub-fluentd/start +++ b/container/sub-fluentd/start @@ -7,14 +7,14 @@ require 'set' require_relative '../defconfig.rb' names = Set.new %w[ - FLUENTD_SERVER_HOST - FLUENTD_SERVER_PORT + MASTER_FLUENTD_HOST + MASTER_FLUENTD_PORT ] defaults = relevant_defaults(names) -defaults['FLUENTD_SERVER_PORT'] ||= '24224' +defaults['MASTER_FLUENTD_PORT'] ||= '24224' env = docker_env(defaults) -raise 'must config FLUENTD_SERVER_HOST' unless defaults['FLUENTD_SERVER_HOST'] +raise 'must config MASTER_FLUENTD_HOST' unless defaults['MASTER_FLUENTD_HOST'] docker_rm 'sub-fluentd' diff --git a/sparrow/3-code/dev-env b/sparrow/3-code/dev-env index 11c7fb0..87431be 100755 --- a/sparrow/3-code/dev-env +++ b/sparrow/3-code/dev-env @@ -8,8 +8,8 @@ server_ip=$(ip route get 1.2.3.4 | awk '{print $7; exit}') : ${sched_port:=3000} : ${gitcache_host:=$server_ip} : ${gitcache_port:=5000} -: ${FLUENTD_SERVER_HOST:=$server_ip} -: ${FLUENTD_SERVER_PORT:=24224} +: ${MASTER_FLUENTD_HOST:=$server_ip} +: ${MASTER_FLUENTD_PORT:=24224} : ${DOCKER_REGISTRY_HOST:=$server_ip} : ${DOCKER_REGISTRY_PORT:=5001} @@ -22,8 +22,8 @@ INITRD_HTTP_HOST: $initrd_http_host INITRD_HTTP_PORT: $initrd_http_port GITCACHE_HOST: $gitcache_host GITCACHE_PORT: $gitcache_port -FLUENTD_SERVER_HOST: $FLUENTD_SERVER_HOST -FLUENTD_SERVER_PORT: $FLUENTD_SERVER_PORT +MASTER_FLUENTD_HOST: $MASTER_FLUENTD_HOST +MASTER_FLUENTD_PORT: $MASTER_FLUENTD_PORT DOCKER_REGISTRY_HOST: $DOCKER_REGISTRY_HOST DOCKER_REGISTRY_PORT: $DOCKER_REGISTRY_PORT EOF diff --git a/src/lib/sched.cr b/src/lib/sched.cr index c32091f..feedef3 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -488,8 +488,8 @@ class Sched full_path_patterns = "#{ENV["CCI_REPOS"]}/lab-#{ENV["lab"]}/allot/idle/#{tbox_group}/*.yaml" extra_job_fields = [ "idle_job=true", - "FLUENTD_SERVER_HOST=#{ENV["FLUENTD_SERVER_HOST"]}", - "FLUENTD_SERVER_PORT=#{ENV["FLUENTD_SERVER_PORT"]}", + "MASTER_FLUENTD_HOST=#{ENV["MASTER_FLUENTD_HOST"]}", + "MASTER_FLUENTD_PORT=#{ENV["MASTER_FLUENTD_PORT"]}", ] Jobfile::Operate.auto_submit_job( -- 2.23.0

1 0

[PATCH compass-ci] lib/sched.cr: fix ameba warning
by Wu Zhende 28 Oct '20

28 Oct '20

[Why] fix ameba warning. def submit_job() begin xxx rescue xxx end end [How] def submit_job() xxx rescue xxx end [warning info] /code/compass-ci/src/lib/sched.cr:162:3 [C] Style/RedundantBegin: Redundant `begin` block detected > def submit_job(env : HTTP::Server::Context) ^ Finished in 132.19 milliseconds 1 inspected, 1 failure. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- src/lib/sched.cr | 48 +++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index c32091f..f3a7b1c 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -160,32 +160,30 @@ class Sched end def submit_job(env : HTTP::Server::Context) - begin - body = env.request.body.not_nil!.gets_to_end - - job_content = JSON.parse(body) - job = Job.new(job_content, job_content["id"]?) - job["commit_date"] = get_commit_date(job) - - # it is not a cluster job if cluster field is empty or - # field's prefix is 'cs-localhost' - cluster_file = job["cluster"] - if cluster_file.empty? || cluster_file.starts_with?("cs-localhost") - return submit_single_job(job) - else - cluster_config = get_cluster_config(cluster_file, - job.lkp_initrd_user, - job.os_arch) - return submit_cluster_job(job, cluster_config) - end - rescue ex - puts ex.inspect_with_backtrace - return [{ - "job_id" => "0", - "message" => ex.to_s, - "job_state" => "submit", - }] + body = env.request.body.not_nil!.gets_to_end + + job_content = JSON.parse(body) + job = Job.new(job_content, job_content["id"]?) + job["commit_date"] = get_commit_date(job) + + # it is not a cluster job if cluster field is empty or + # field's prefix is 'cs-localhost' + cluster_file = job["cluster"] + if cluster_file.empty? || cluster_file.starts_with?("cs-localhost") + return submit_single_job(job) + else + cluster_config = get_cluster_config(cluster_file, + job.lkp_initrd_user, + job.os_arch) + return submit_cluster_job(job, cluster_config) end + rescue ex + puts ex.inspect_with_backtrace + return [{ + "job_id" => "0", + "message" => ex.to_s, + "job_state" => "submit", + }] end # return: -- 2.23.0

3 3

[PATCH compass-ci] sparrow/0-package/os: skip when intsall failed
by Xu Xijian 28 Oct '20

28 Oct '20

[why] When install several packages, if one of them is installed failed, should go ahead to install next packages. [how] Add "--skip-broken" for "yum install" cmd. Add "--fix-missing" for "apt-get install" cmd. Signed-off-by: Xu Xijian <xuxijian(a)huawei.com> --- sparrow/0-package/os/centos | 2 +- sparrow/0-package/os/debian | 2 +- sparrow/0-package/os/openEuler | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sparrow/0-package/os/centos b/sparrow/0-package/os/centos index 261592c..4243f99 100755 --- a/sparrow/0-package/os/centos +++ b/sparrow/0-package/os/centos @@ -22,4 +22,4 @@ pkgs=( busybox ) -yum install -y "${pkgs[@]}" +yum install -y --skip-broken "${pkgs[@]}" diff --git a/sparrow/0-package/os/debian b/sparrow/0-package/os/debian index 020c34a..16ef0a9 100755 --- a/sparrow/0-package/os/debian +++ b/sparrow/0-package/os/debian @@ -20,4 +20,4 @@ pkgs=( busybox ) -apt-get install -y "${pkgs[@]}" +apt-get install -y --fix-missing "${pkgs[@]}" diff --git a/sparrow/0-package/os/openEuler b/sparrow/0-package/os/openEuler index 5c64fe8..ba298c8 100755 --- a/sparrow/0-package/os/openEuler +++ b/sparrow/0-package/os/openEuler @@ -21,7 +21,7 @@ pkgs=( busybox ) -yum install -y "${pkgs[@]}" +yum install -y --skip-broken "${pkgs[@]}" wget http://rpmfind.net/linux/openmandriva/cooker/repository/aarch64/main/releas… wget http://rpmfind.net/linux/openmandriva/cooker/repository/aarch64/main/releas… -- 2.23.0

1 0

[PATCH lab-z9 2/2] change rollback to no << format, until lkp support.
by Zhang Dewan 28 Oct '20

28 Oct '20

Signed-off-by: Zhang Dewan <513619464(a)qq.com> --- hosts/taishan200-2280-2s48p-256g--a101 | 4 +++- hosts/taishan200-2280-2s48p-256g--a103 | 4 +++- hosts/taishan200-2280-2s48p-256g--a104 | 4 +++- hosts/taishan200-2280-2s48p-256g--a106 | 4 +++- hosts/taishan200-2280-2s48p-256g--a107 | 4 +++- hosts/taishan200-2280-2s48p-256g--a11 | 4 +++- hosts/taishan200-2280-2s48p-256g--a13 | 4 +++- hosts/taishan200-2280-2s48p-256g--a14 | 4 +++- hosts/taishan200-2280-2s48p-256g--a15 | 4 +++- hosts/taishan200-2280-2s48p-256g--a16 | 4 +++- hosts/taishan200-2280-2s48p-256g--a17 | 4 +++- hosts/taishan200-2280-2s48p-256g--a18 | 4 +++- hosts/taishan200-2280-2s48p-256g--a19 | 4 +++- hosts/taishan200-2280-2s48p-256g--a21 | 4 +++- hosts/taishan200-2280-2s48p-256g--a22 | 4 +++- hosts/taishan200-2280-2s48p-256g--a24 | 4 +++- hosts/taishan200-2280-2s48p-256g--a25 | 4 +++- hosts/taishan200-2280-2s48p-256g--a26 | 4 +++- hosts/taishan200-2280-2s48p-256g--a27 | 4 +++- hosts/taishan200-2280-2s48p-256g--a28 | 4 +++- hosts/taishan200-2280-2s48p-256g--a29 | 4 +++- hosts/taishan200-2280-2s48p-256g--a30 | 4 +++- hosts/taishan200-2280-2s48p-256g--a31 | 4 +++- hosts/taishan200-2280-2s48p-256g--a32 | 4 +++- hosts/taishan200-2280-2s48p-256g--a33 | 4 +++- hosts/taishan200-2280-2s48p-256g--a34 | 4 +++- hosts/taishan200-2280-2s48p-256g--a35 | 4 +++- hosts/taishan200-2280-2s48p-256g--a52 | 4 +++- hosts/taishan200-2280-2s48p-256g--a53 | 4 +++- hosts/taishan200-2280-2s48p-256g--a60 | 4 +++- hosts/taishan200-2280-2s48p-256g--a61 | 4 +++- hosts/taishan200-2280-2s48p-256g--a62 | 4 +++- hosts/taishan200-2280-2s48p-256g--a63 | 4 +++- hosts/taishan200-2280-2s48p-256g--a66 | 4 +++- hosts/taishan200-2280-2s48p-256g--a67 | 4 +++- hosts/taishan200-2280-2s48p-256g--a68 | 4 +++- hosts/taishan200-2280-2s48p-256g--a69 | 4 +++- hosts/taishan200-2280-2s48p-256g--a70 | 4 +++- hosts/taishan200-2280-2s48p-256g--a71 | 4 +++- hosts/taishan200-2280-2s48p-256g--a87 | 4 +++- hosts/taishan200-2280-2s48p-512g--a102 | 4 +++- hosts/taishan200-2280-2s48p-512g--a105 | 4 +++- hosts/taishan200-2280-2s48p-512g--a95 | 4 +++- hosts/taishan200-2280-2s64p-256g--a10 | 4 +++- hosts/taishan200-2280-2s64p-256g--a3 | 4 +++- hosts/taishan200-2280-2s64p-256g--a36 | 4 +++- hosts/taishan200-2280-2s64p-256g--a4 | 4 +++- hosts/taishan200-2280-2s64p-256g--a40 | 4 +++- hosts/taishan200-2280-2s64p-256g--a41 | 4 +++- hosts/taishan200-2280-2s64p-256g--a42 | 4 +++- hosts/taishan200-2280-2s64p-256g--a8 | 4 +++- hosts/taishan200-2280-2s64p-256g--a9 | 4 +++- 52 files changed, 156 insertions(+), 52 deletions(-) diff --git a/hosts/taishan200-2280-2s48p-256g--a101 b/hosts/taishan200-2280-2s48p-256g--a101 index b84e555..e085dea 100644 --- a/hosts/taishan200-2280-2s48p-256g--a101 +++ b/hosts/taishan200-2280-2s48p-256g--a101 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 2 nr_ssd_partitions: 1 hdd_partitions: diff --git a/hosts/taishan200-2280-2s48p-256g--a103 b/hosts/taishan200-2280-2s48p-256g--a103 index c0685c2..cd49a09 100644 --- a/hosts/taishan200-2280-2s48p-256g--a103 +++ b/hosts/taishan200-2280-2s48p-256g--a103 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88bdc69 diff --git a/hosts/taishan200-2280-2s48p-256g--a104 b/hosts/taishan200-2280-2s48p-256g--a104 index 51f0f8c..27fac67 100644 --- a/hosts/taishan200-2280-2s48p-256g--a104 +++ b/hosts/taishan200-2280-2s48p-256g--a104 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8892431 diff --git a/hosts/taishan200-2280-2s48p-256g--a106 b/hosts/taishan200-2280-2s48p-256g--a106 index 1219bcc..0e4787e 100644 --- a/hosts/taishan200-2280-2s48p-256g--a106 +++ b/hosts/taishan200-2280-2s48p-256g--a106 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b883bf99 diff --git a/hosts/taishan200-2280-2s48p-256g--a107 b/hosts/taishan200-2280-2s48p-256g--a107 index 3ec9f39..e62298c 100644 --- a/hosts/taishan200-2280-2s48p-256g--a107 +++ b/hosts/taishan200-2280-2s48p-256g--a107 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8917c39 diff --git a/hosts/taishan200-2280-2s48p-256g--a11 b/hosts/taishan200-2280-2s48p-256g--a11 index 142b44e..db79d95 100644 --- a/hosts/taishan200-2280-2s48p-256g--a11 +++ b/hosts/taishan200-2280-2s48p-256g--a11 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8891431-part1 diff --git a/hosts/taishan200-2280-2s48p-256g--a13 b/hosts/taishan200-2280-2s48p-256g--a13 index 173a2bf..24fe52f 100644 --- a/hosts/taishan200-2280-2s48p-256g--a13 +++ b/hosts/taishan200-2280-2s48p-256g--a13 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000c500c2799bb3 diff --git a/hosts/taishan200-2280-2s48p-256g--a14 b/hosts/taishan200-2280-2s48p-256g--a14 index 3e70159..e8f3f53 100644 --- a/hosts/taishan200-2280-2s48p-256g--a14 +++ b/hosts/taishan200-2280-2s48p-256g--a14 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88b4475 diff --git a/hosts/taishan200-2280-2s48p-256g--a15 b/hosts/taishan200-2280-2s48p-256g--a15 index 8ac1654..0a945f1 100644 --- a/hosts/taishan200-2280-2s48p-256g--a15 +++ b/hosts/taishan200-2280-2s48p-256g--a15 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b841fff5 diff --git a/hosts/taishan200-2280-2s48p-256g--a16 b/hosts/taishan200-2280-2s48p-256g--a16 index 1355932..30caaca 100644 --- a/hosts/taishan200-2280-2s48p-256g--a16 +++ b/hosts/taishan200-2280-2s48p-256g--a16 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88bf271 diff --git a/hosts/taishan200-2280-2s48p-256g--a17 b/hosts/taishan200-2280-2s48p-256g--a17 index 5d4fe01..9bfeea4 100644 --- a/hosts/taishan200-2280-2s48p-256g--a17 +++ b/hosts/taishan200-2280-2s48p-256g--a17 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88b44cd diff --git a/hosts/taishan200-2280-2s48p-256g--a18 b/hosts/taishan200-2280-2s48p-256g--a18 index 3e36555..c3f9288 100644 --- a/hosts/taishan200-2280-2s48p-256g--a18 +++ b/hosts/taishan200-2280-2s48p-256g--a18 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b891b4d1 diff --git a/hosts/taishan200-2280-2s48p-256g--a19 b/hosts/taishan200-2280-2s48p-256g--a19 index f7233e4..9113f7e 100644 --- a/hosts/taishan200-2280-2s48p-256g--a19 +++ b/hosts/taishan200-2280-2s48p-256g--a19 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8923939 diff --git a/hosts/taishan200-2280-2s48p-256g--a21 b/hosts/taishan200-2280-2s48p-256g--a21 index 8331e55..0156a85 100644 --- a/hosts/taishan200-2280-2s48p-256g--a21 +++ b/hosts/taishan200-2280-2s48p-256g--a21 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88bf2d5 diff --git a/hosts/taishan200-2280-2s48p-256g--a22 b/hosts/taishan200-2280-2s48p-256g--a22 index 94549a9..0c3e0cb 100644 --- a/hosts/taishan200-2280-2s48p-256g--a22 +++ b/hosts/taishan200-2280-2s48p-256g--a22 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8919069 diff --git a/hosts/taishan200-2280-2s48p-256g--a24 b/hosts/taishan200-2280-2s48p-256g--a24 index df8bd3c..cf6f0ea 100644 --- a/hosts/taishan200-2280-2s48p-256g--a24 +++ b/hosts/taishan200-2280-2s48p-256g--a24 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8917d59 diff --git a/hosts/taishan200-2280-2s48p-256g--a25 b/hosts/taishan200-2280-2s48p-256g--a25 index eb0ba8e..3d81057 100644 --- a/hosts/taishan200-2280-2s48p-256g--a25 +++ b/hosts/taishan200-2280-2s48p-256g--a25 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88b4499 diff --git a/hosts/taishan200-2280-2s48p-256g--a26 b/hosts/taishan200-2280-2s48p-256g--a26 index 1f8136a..cf18490 100644 --- a/hosts/taishan200-2280-2s48p-256g--a26 +++ b/hosts/taishan200-2280-2s48p-256g--a26 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88bf131 diff --git a/hosts/taishan200-2280-2s48p-256g--a27 b/hosts/taishan200-2280-2s48p-256g--a27 index 25b076f..4ae374a 100644 --- a/hosts/taishan200-2280-2s48p-256g--a27 +++ b/hosts/taishan200-2280-2s48p-256g--a27 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8918ea9 diff --git a/hosts/taishan200-2280-2s48p-256g--a28 b/hosts/taishan200-2280-2s48p-256g--a28 index 2901c3e..c62b080 100644 --- a/hosts/taishan200-2280-2s48p-256g--a28 +++ b/hosts/taishan200-2280-2s48p-256g--a28 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000c500cdf1eb07 diff --git a/hosts/taishan200-2280-2s48p-256g--a29 b/hosts/taishan200-2280-2s48p-256g--a29 index f1fdd6b..f189981 100644 --- a/hosts/taishan200-2280-2s48p-256g--a29 +++ b/hosts/taishan200-2280-2s48p-256g--a29 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8918425 diff --git a/hosts/taishan200-2280-2s48p-256g--a30 b/hosts/taishan200-2280-2s48p-256g--a30 index 2dbc84f..7d02b00 100644 --- a/hosts/taishan200-2280-2s48p-256g--a30 +++ b/hosts/taishan200-2280-2s48p-256g--a30 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b883b881 diff --git a/hosts/taishan200-2280-2s48p-256g--a31 b/hosts/taishan200-2280-2s48p-256g--a31 index 085a150..838ce10 100644 --- a/hosts/taishan200-2280-2s48p-256g--a31 +++ b/hosts/taishan200-2280-2s48p-256g--a31 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b883b929 diff --git a/hosts/taishan200-2280-2s48p-256g--a32 b/hosts/taishan200-2280-2s48p-256g--a32 index 0f3396c..b9439e5 100644 --- a/hosts/taishan200-2280-2s48p-256g--a32 +++ b/hosts/taishan200-2280-2s48p-256g--a32 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88bf141 diff --git a/hosts/taishan200-2280-2s48p-256g--a33 b/hosts/taishan200-2280-2s48p-256g--a33 index dba4da1..9e27a1b 100644 --- a/hosts/taishan200-2280-2s48p-256g--a33 +++ b/hosts/taishan200-2280-2s48p-256g--a33 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8919555 diff --git a/hosts/taishan200-2280-2s48p-256g--a34 b/hosts/taishan200-2280-2s48p-256g--a34 index f32c952..67ebf3e 100644 --- a/hosts/taishan200-2280-2s48p-256g--a34 +++ b/hosts/taishan200-2280-2s48p-256g--a34 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88be219 diff --git a/hosts/taishan200-2280-2s48p-256g--a35 b/hosts/taishan200-2280-2s48p-256g--a35 index 7eb3c79..fcc4816 100644 --- a/hosts/taishan200-2280-2s48p-256g--a35 +++ b/hosts/taishan200-2280-2s48p-256g--a35 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399886a71a5 diff --git a/hosts/taishan200-2280-2s48p-256g--a52 b/hosts/taishan200-2280-2s48p-256g--a52 index be10a77..4245b1e 100644 --- a/hosts/taishan200-2280-2s48p-256g--a52 +++ b/hosts/taishan200-2280-2s48p-256g--a52 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000c500cdefd89b diff --git a/hosts/taishan200-2280-2s48p-256g--a53 b/hosts/taishan200-2280-2s48p-256g--a53 index 546e5ef..2ec92dd 100644 --- a/hosts/taishan200-2280-2s48p-256g--a53 +++ b/hosts/taishan200-2280-2s48p-256g--a53 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-35000c500bd6aa4e3 diff --git a/hosts/taishan200-2280-2s48p-256g--a60 b/hosts/taishan200-2280-2s48p-256g--a60 index 0bf91a1..fc565a2 100644 --- a/hosts/taishan200-2280-2s48p-256g--a60 +++ b/hosts/taishan200-2280-2s48p-256g--a60 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000c500bd67640b diff --git a/hosts/taishan200-2280-2s48p-256g--a61 b/hosts/taishan200-2280-2s48p-256g--a61 index 48f4251..9bbbadb 100644 --- a/hosts/taishan200-2280-2s48p-256g--a61 +++ b/hosts/taishan200-2280-2s48p-256g--a61 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399886a7869 diff --git a/hosts/taishan200-2280-2s48p-256g--a62 b/hosts/taishan200-2280-2s48p-256g--a62 index 9c1218f..f4eac99 100644 --- a/hosts/taishan200-2280-2s48p-256g--a62 +++ b/hosts/taishan200-2280-2s48p-256g--a62 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b892d131 diff --git a/hosts/taishan200-2280-2s48p-256g--a63 b/hosts/taishan200-2280-2s48p-256g--a63 index cab9044..3101584 100644 --- a/hosts/taishan200-2280-2s48p-256g--a63 +++ b/hosts/taishan200-2280-2s48p-256g--a63 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399886b0431 diff --git a/hosts/taishan200-2280-2s48p-256g--a66 b/hosts/taishan200-2280-2s48p-256g--a66 index 081ec02..e906139 100644 --- a/hosts/taishan200-2280-2s48p-256g--a66 +++ b/hosts/taishan200-2280-2s48p-256g--a66 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000c5009a671773 diff --git a/hosts/taishan200-2280-2s48p-256g--a67 b/hosts/taishan200-2280-2s48p-256g--a67 index 2009165..3439715 100644 --- a/hosts/taishan200-2280-2s48p-256g--a67 +++ b/hosts/taishan200-2280-2s48p-256g--a67 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88aed21 diff --git a/hosts/taishan200-2280-2s48p-256g--a68 b/hosts/taishan200-2280-2s48p-256g--a68 index 5bc660a..529ed02 100644 --- a/hosts/taishan200-2280-2s48p-256g--a68 +++ b/hosts/taishan200-2280-2s48p-256g--a68 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8909f81 diff --git a/hosts/taishan200-2280-2s48p-256g--a69 b/hosts/taishan200-2280-2s48p-256g--a69 index 4a5ad9a..475c8df 100644 --- a/hosts/taishan200-2280-2s48p-256g--a69 +++ b/hosts/taishan200-2280-2s48p-256g--a69 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88be92d diff --git a/hosts/taishan200-2280-2s48p-256g--a70 b/hosts/taishan200-2280-2s48p-256g--a70 index 75d114d..efd3c33 100644 --- a/hosts/taishan200-2280-2s48p-256g--a70 +++ b/hosts/taishan200-2280-2s48p-256g--a70 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b890931d diff --git a/hosts/taishan200-2280-2s48p-256g--a71 b/hosts/taishan200-2280-2s48p-256g--a71 index cc20212..041edb7 100644 --- a/hosts/taishan200-2280-2s48p-256g--a71 +++ b/hosts/taishan200-2280-2s48p-256g--a71 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 mac_addr: - 44:67:47:d7:6d:e6 - 44:67:47:d7:6d:e7 diff --git a/hosts/taishan200-2280-2s48p-256g--a87 b/hosts/taishan200-2280-2s48p-256g--a87 index 381d8bf..1a307ba 100644 --- a/hosts/taishan200-2280-2s48p-256g--a87 +++ b/hosts/taishan200-2280-2s48p-256g--a87 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399886a6b55 diff --git a/hosts/taishan200-2280-2s48p-512g--a102 b/hosts/taishan200-2280-2s48p-512g--a102 index 2e1ad9a..696990a 100644 --- a/hosts/taishan200-2280-2s48p-512g--a102 +++ b/hosts/taishan200-2280-2s48p-512g--a102 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-512g +nr_node: 4 +nr_cpu: 96 +memory: 512 nr_hdd_partitions: 1 nr_ssd_partitions: 3 hdd_partitions: diff --git a/hosts/taishan200-2280-2s48p-512g--a105 b/hosts/taishan200-2280-2s48p-512g--a105 index b164f04..e8f93eb 100644 --- a/hosts/taishan200-2280-2s48p-512g--a105 +++ b/hosts/taishan200-2280-2s48p-512g--a105 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-512g +nr_node: 4 +nr_cpu: 96 +memory: 512 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b891945d diff --git a/hosts/taishan200-2280-2s48p-512g--a95 b/hosts/taishan200-2280-2s48p-512g--a95 index 0e88e91..f1484ef 100644 --- a/hosts/taishan200-2280-2s48p-512g--a95 +++ b/hosts/taishan200-2280-2s48p-512g--a95 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-512g +nr_node: 4 +nr_cpu: 96 +memory: 512 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000039988792e31 diff --git a/hosts/taishan200-2280-2s64p-256g--a10 b/hosts/taishan200-2280-2s64p-256g--a10 index f34dc96..bd65c59 100644 --- a/hosts/taishan200-2280-2s64p-256g--a10 +++ b/hosts/taishan200-2280-2s64p-256g--a10 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s64p-256g +nr_node: 4 +nr_cpu: 128 +memory: 256 nr_ssd_partitions: 1 rootfs_partition: - /dev/disk/by-id/scsi-350000399c8030fd5 diff --git a/hosts/taishan200-2280-2s64p-256g--a3 b/hosts/taishan200-2280-2s64p-256g--a3 index f372df5..c363a13 100644 --- a/hosts/taishan200-2280-2s64p-256g--a3 +++ b/hosts/taishan200-2280-2s64p-256g--a3 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s64p-256g +nr_node: 4 +nr_cpu: 128 +memory: 256 nr_ssd_partitions: 3 ssd_partitions: - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43895-part1 diff --git a/hosts/taishan200-2280-2s64p-256g--a36 b/hosts/taishan200-2280-2s64p-256g--a36 index 4fa59e0..d11c173 100644 --- a/hosts/taishan200-2280-2s64p-256g--a36 +++ b/hosts/taishan200-2280-2s64p-256g--a36 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s64p-256g +nr_node: 4 +nr_cpu: 128 +memory: 256 nr_ssd_partitions: 2 rootfs_partition: - /dev/disk/by-id/scsi-3500003999813487d diff --git a/hosts/taishan200-2280-2s64p-256g--a4 b/hosts/taishan200-2280-2s64p-256g--a4 index d00ac8a..b475b9a 100644 --- a/hosts/taishan200-2280-2s64p-256g--a4 +++ b/hosts/taishan200-2280-2s64p-256g--a4 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s64p-256g +nr_node: 4 +nr_cpu: 128 +memory: 256 nr_ssd_partitions: 3 ssd_partitions: - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43892-part1 diff --git a/hosts/taishan200-2280-2s64p-256g--a40 b/hosts/taishan200-2280-2s64p-256g--a40 index a914a29..59a79f5 100644 --- a/hosts/taishan200-2280-2s64p-256g--a40 +++ b/hosts/taishan200-2280-2s64p-256g--a40 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s64p-256g +nr_node: 4 +nr_cpu: 128 +memory: 256 nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-3500003999812ed81 diff --git a/hosts/taishan200-2280-2s64p-256g--a41 b/hosts/taishan200-2280-2s64p-256g--a41 index 6291741..d173c47 100644 --- a/hosts/taishan200-2280-2s64p-256g--a41 +++ b/hosts/taishan200-2280-2s64p-256g--a41 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s64p-256g +nr_node: 4 +nr_cpu: 128 +memory: 256 nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8919495 diff --git a/hosts/taishan200-2280-2s64p-256g--a42 b/hosts/taishan200-2280-2s64p-256g--a42 index 32b9b00..6eed801 100644 --- a/hosts/taishan200-2280-2s64p-256g--a42 +++ b/hosts/taishan200-2280-2s64p-256g--a42 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s64p-256g +nr_node: 4 +nr_cpu: 128 +memory: 256 nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8918a11 diff --git a/hosts/taishan200-2280-2s64p-256g--a8 b/hosts/taishan200-2280-2s64p-256g--a8 index 582ee27..48cf470 100644 --- a/hosts/taishan200-2280-2s64p-256g--a8 +++ b/hosts/taishan200-2280-2s64p-256g--a8 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s64p-256g +nr_node: 4 +nr_cpu: 128 +memory: 256 rootfs_partition: - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43325 mac_addr: diff --git a/hosts/taishan200-2280-2s64p-256g--a9 b/hosts/taishan200-2280-2s64p-256g--a9 index 876c586..55e4a1e 100644 --- a/hosts/taishan200-2280-2s64p-256g--a9 +++ b/hosts/taishan200-2280-2s64p-256g--a9 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s64p-256g +nr_node: 4 +nr_cpu: 128 +memory: 256 nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-35000c500bd6a1347 -- 2.23.0

1 0