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

[PATCH lkp-tests] spec: update submit_spec.rb results
by Wei Jihui 15 Oct '20

15 Oct '20

run rspec spec/submit_spec.rb the results is change. Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- spec/submit/ftq/ftq-1000-2-100000ss-add.yaml | 4 ++-- spec/submit/ftq/ftq-10000-2-100000ss-add.yaml | 4 ++-- spec/submit/ftq/ftq-20-2-6000ss-cache.yaml | 4 ++-- ...4-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spec/submit/ftq/ftq-1000-2-100000ss-add.yaml b/spec/submit/ftq/ftq-1000-2-100000ss-add.yaml index 7522fb96..3849bb30 100644 --- a/spec/submit/ftq/ftq-1000-2-100000ss-add.yaml +++ b/spec/submit/ftq/ftq-1000-2-100000ss-add.yaml @@ -9,13 +9,13 @@ ftq: freq: 1000 testbox: vm-2p8g--spec_submit tbox_group: vm-2p8g--spec_submit +lab: spec_lab provider: qemu template: kvm -nr_cpu: 2 nr_node: 1 +nr_cpu: 2 memory: 8G arch: aarch64 -lab: spec_lab cpufreq_governor: need_kconfig: - CONFIG_KVM_GUEST=y diff --git a/spec/submit/ftq/ftq-10000-2-100000ss-add.yaml b/spec/submit/ftq/ftq-10000-2-100000ss-add.yaml index ff941dfb..2d9785e4 100644 --- a/spec/submit/ftq/ftq-10000-2-100000ss-add.yaml +++ b/spec/submit/ftq/ftq-10000-2-100000ss-add.yaml @@ -9,13 +9,13 @@ ftq: freq: 10000 testbox: vm-2p8g--spec_submit tbox_group: vm-2p8g--spec_submit +lab: spec_lab provider: qemu template: kvm -nr_cpu: 2 nr_node: 1 +nr_cpu: 2 memory: 8G arch: aarch64 -lab: spec_lab cpufreq_governor: need_kconfig: - CONFIG_KVM_GUEST=y diff --git a/spec/submit/ftq/ftq-20-2-6000ss-cache.yaml b/spec/submit/ftq/ftq-20-2-6000ss-cache.yaml index 3fad02dd..6c915e93 100644 --- a/spec/submit/ftq/ftq-20-2-6000ss-cache.yaml +++ b/spec/submit/ftq/ftq-20-2-6000ss-cache.yaml @@ -9,13 +9,13 @@ ftq: freq: 20 testbox: vm-2p8g--spec_submit tbox_group: vm-2p8g--spec_submit +lab: spec_lab provider: qemu template: kvm -nr_cpu: 2 nr_node: 1 +nr_cpu: 2 memory: 8G arch: aarch64 -lab: spec_lab cpufreq_governor: need_kconfig: - CONFIG_KVM_GUEST=y diff --git a/spec/submit/redis/redis-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml b/spec/submit/redis/redis-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml index 5b3cb6ec..43132b8f 100644 --- a/spec/submit/redis/redis-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml +++ b/spec/submit/redis/redis-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml @@ -28,13 +28,13 @@ if role client: testbox: vm-2p8g--spec_submit tbox_group: vm-2p8g--spec_submit node_roles: server client +lab: spec_lab provider: qemu template: kvm -nr_cpu: 2 nr_node: 1 +nr_cpu: 2 memory: 8G arch: aarch64 -lab: spec_lab kmsg: boot-time: uptime: -- 2.23.0

1 0

[PATCH v7 lkp-tests] sshd: send emails to login services for users
by Zhang Yale 15 Oct '20

15 Oct '20

Provide a login port for user by email, determine whether to send the ssh_port message based on the uuid. Signed-off-by: Zhang Yale <zhangyale3(a)huawei.com> --- daemon/sshd | 89 +++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 69 insertions(+), 20 deletions(-) diff --git a/daemon/sshd b/daemon/sshd index 98f31d77..75802710 100755 --- a/daemon/sshd +++ b/daemon/sshd @@ -1,6 +1,16 @@ #!/bin/sh # pub_key # email +# uuid +# ssh_port_len +# ssh_port_base + +. $LKP_SRC/lib/http.sh + +sshr_ip=$LKP_SERVER +sshr_port=5051 +[ -n "$sshr_port_len" ] || sshr_port_len=3 +[ -n "$sshr_port_base" ] || sshr_port_base=30010 run_ssh() { @@ -11,40 +21,79 @@ run_ssh() systemctl start sshd } -compose_email() +data_success() { - deadline=$(date -d "+$runtime seconds" +"%Y-%m-%d %H:%M:%S") data="To: $email -Subject: [NOTIFY compass-ci] $testbox ready to ssh +Subject: [NOTIFY Compass-ci] $testbox ready to use + +Dear $user_name: + Thanks for your participation in software ecosystem! + According to your application, $testbox has been provisioned. + The datails are as follows: -Dear $email: - Thanks for your participation in Kunpeng and software ecosystem! - According to your application, $testbox has been provisioned. - The datails are as follows: + login: + ssh root(a)api.compass-ci.openeuler.org -p $port + Due time: + $deadline + HW: + nr_cpu: $nr_cpu + memory: $memory + testbox: $testbox + OS: + $os $os_version $os_arch - Login: - ssh root@$PUB_IP - Due time: - $deadline +Regards +Compass-ci +" +} - HW: - nr_cpu: $nr_cpu - memory: $memory - testbox: $testbox - OS: - $os $os_version $os_arch +data_failure() +{ + data="To: $email +Subject: [NOTIFY Compass-ci] Applying $testbox failed + +Dear $user_name: + Sorry to inform you that your application failed. + You may need to wait for a while and then try again. Regards -compass-ci +Compass-ci " } +compose_email() +{ + deadline=$(date -d "+$runtime seconds" +"%Y-%m-%d %H:%M:%S") + if [ -n "$port" ]; then + data_success + else + data_failure + fi +} + +get_port() +{ + [ -n "$uuid" ] || return + for i in $(seq 1 10) + do + port=$(($(date +%s%N)%"$sshr_port_len"+"$sshr_port_base")) + ssh -o StrictHostKeyChecking=no -o ExitOnForwardFailure=yes -o TCPKeepAlive=yes \ + -Nf -R $port:localhost:22 sshr@"$sshr_ip" -p "$sshr_port" &>/dev/null + [ $? -eq 0 ] || continue + return + done + port="" +} + run_email() { - [ -n "$email" ] || return 0 + [ -n "$email" ] && [ -n "$uuid" ] || return 0 + user_name=$(echo "$email" | awk -F '@' '{print $1}') compose_email - curl -XPOST "$MAIL_HOST:$MAIL_PORT/send_mail_text" -d "$data" + curl -XPOST "${MAIL_HOST:-$LKP_SERVER}:${MAIL_PORT:-11312}/send_mail_text" -d "$data" } run_ssh +get_port +report_ssh_port $port run_email -- 2.23.0

1 1

[PATCH compass-ci] fix: taskqueue_api: active close http client
by Tong Qunfeng 15 Oct '20

15 Oct '20

before patch: there left a lot of netstat in TIME_WAIT docker0_ip:3060 scheduler_ip:any_port TIME_WAIT it's timewait timer is 60s. after 60s, this any_port will be released after this patch: http connect to taskqueue will be release as soon as the visit is finished (after submit job | consume job) Signed-off-by: Tong Qunfeng <taxcom(a)tom.com> --- src/lib/taskqueue_api.cr | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/lib/taskqueue_api.cr b/src/lib/taskqueue_api.cr index 8d0db5d..99c3933 100644 --- a/src/lib/taskqueue_api.cr +++ b/src/lib/taskqueue_api.cr @@ -12,7 +12,9 @@ class TaskQueueAPI def add_task(service_queue_path : String, task : JSON::Any) params = HTTP::Params.encode({"queue" => service_queue_path}) - response = HTTP::Client.post("http://#{@host}:#{@port}/add?" + params, body: task.to_json) + client = HTTP::Client.new(@host, port: @port) + response = client.post("/add?" + params, body: task.to_json) + client.close arrange_response(response) end @@ -32,7 +34,9 @@ class TaskQueueAPI end private def response_put_api(cmd : String, params : String) - response = HTTP::Client.put("http://#{@host}:#{@port}/#{cmd}?" + params) + client = HTTP::Client.new(@host, port: @port) + response = client.put("/#{cmd}?" + params) + client.close arrange_response(response) end -- 2.23.0

1 0

[PATCH lab-z9] new hosts file
by Zhang Dewan 15 Oct '20

15 Oct '20

--- hosts/m | 40 +++++++++++++++++++++++++++ hosts/p | 10 +++++++ hosts/taishan200-2280-2s48p-256g--a11 | 1 + hosts/taishan200-2280-2s48p-256g--a13 | 1 + hosts/taishan200-2280-2s48p-256g--a14 | 1 + hosts/taishan200-2280-2s48p-256g--a15 | 1 + hosts/taishan200-2280-2s48p-256g--a17 | 1 + hosts/taishan200-2280-2s48p-256g--a18 | 1 + hosts/taishan200-2280-2s48p-256g--a19 | 1 + hosts/taishan200-2280-2s48p-256g--a21 | 1 + hosts/taishan200-2280-2s48p-256g--a22 | 1 + hosts/taishan200-2280-2s48p-256g--a24 | 1 + hosts/taishan200-2280-2s48p-256g--a25 | 1 + hosts/taishan200-2280-2s48p-256g--a26 | 1 + hosts/taishan200-2280-2s48p-256g--a27 | 1 + hosts/taishan200-2280-2s48p-256g--a28 | 1 + hosts/taishan200-2280-2s48p-256g--a29 | 1 + hosts/taishan200-2280-2s48p-256g--a30 | 1 + hosts/taishan200-2280-2s48p-256g--a31 | 1 + hosts/taishan200-2280-2s48p-256g--a32 | 1 + hosts/taishan200-2280-2s48p-256g--a33 | 1 + hosts/taishan200-2280-2s48p-256g--a34 | 1 + hosts/taishan200-2280-2s48p-256g--a52 | 1 + hosts/taishan200-2280-2s48p-256g--a53 | 1 + hosts/taishan200-2280-2s48p-256g--a60 | 1 + hosts/taishan200-2280-2s48p-256g--a61 | 1 + hosts/taishan200-2280-2s48p-256g--a62 | 1 + hosts/taishan200-2280-2s48p-256g--a66 | 1 + hosts/taishan200-2280-2s48p-256g--a67 | 1 + hosts/taishan200-2280-2s48p-256g--a68 | 1 + hosts/taishan200-2280-2s48p-256g--a69 | 1 + hosts/taishan200-2280-2s48p-256g--a70 | 1 + hosts/taishan200-2280-2s48p-256g--a71 | 1 + hosts/taishan200-2280-2s64p-256g--a10 | 1 + hosts/taishan200-2280-2s64p-256g--a3 | 1 + hosts/taishan200-2280-2s64p-256g--a36 | 1 + hosts/taishan200-2280-2s64p-256g--a4 | 1 + hosts/taishan200-2280-2s64p-256g--a40 | 1 + hosts/taishan200-2280-2s64p-256g--a41 | 1 + hosts/taishan200-2280-2s64p-256g--a42 | 1 + hosts/taishan200-2280-2s64p-256g--a8 | 1 + hosts/taishan200-2280-2s64p-256g--a9 | 3 +- 42 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 hosts/m create mode 100644 hosts/p diff --git a/hosts/m b/hosts/m new file mode 100644 index 0000000..b73dfb7 --- /dev/null +++ b/hosts/m @@ -0,0 +1,40 @@ +taishan200-2280-2s48p-256g--a11 a11 +taishan200-2280-2s48p-256g--a13 a13 +taishan200-2280-2s48p-256g--a14 a14 +taishan200-2280-2s48p-256g--a15 a15 +taishan200-2280-2s48p-256g--a17 a17 +taishan200-2280-2s48p-256g--a18 a18 +taishan200-2280-2s48p-256g--a19 a19 +taishan200-2280-2s48p-256g--a21 a21 +taishan200-2280-2s48p-256g--a22 a22 +taishan200-2280-2s48p-256g--a24 a24 +taishan200-2280-2s48p-256g--a25 a25 +taishan200-2280-2s48p-256g--a26 a26 +taishan200-2280-2s48p-256g--a27 a27 +taishan200-2280-2s48p-256g--a28 a28 +taishan200-2280-2s48p-256g--a29 a29 +taishan200-2280-2s48p-256g--a30 a30 +taishan200-2280-2s48p-256g--a31 a31 +taishan200-2280-2s48p-256g--a32 a32 +taishan200-2280-2s48p-256g--a33 a33 +taishan200-2280-2s48p-256g--a34 a34 +taishan200-2280-2s48p-256g--a52 a52 +taishan200-2280-2s48p-256g--a53 a53 +taishan200-2280-2s48p-256g--a60 a60 +taishan200-2280-2s48p-256g--a61 a61 +taishan200-2280-2s48p-256g--a62 a62 +taishan200-2280-2s48p-256g--a66 a66 +taishan200-2280-2s48p-256g--a67 a67 +taishan200-2280-2s48p-256g--a68 a68 +taishan200-2280-2s48p-256g--a69 a69 +taishan200-2280-2s48p-256g--a70 a70 +taishan200-2280-2s48p-256g--a71 a71 +taishan200-2280-2s64p-256g--a10 a10 +taishan200-2280-2s64p-256g--a3 a3 +taishan200-2280-2s64p-256g--a36 a36 +taishan200-2280-2s64p-256g--a4 a4 +taishan200-2280-2s64p-256g--a40 a40 +taishan200-2280-2s64p-256g--a41 a41 +taishan200-2280-2s64p-256g--a42 a42 +taishan200-2280-2s64p-256g--a8 a8 +taishan200-2280-2s64p-256g--a9 a9 diff --git a/hosts/p b/hosts/p new file mode 100644 index 0000000..9d47282 --- /dev/null +++ b/hosts/p @@ -0,0 +1,10 @@ +#!/bin/bash + +while read line +do + + i=$(echo $line | awk '{print $2}') + j=$(echo $line | awk '{print $1}') + ip=$(grep $i /home/dewan/servers.info | head -n 1 |awk '{print $1}') + echo "ipmi_ip: $ip" >> $j +done < m diff --git a/hosts/taishan200-2280-2s48p-256g--a11 b/hosts/taishan200-2280-2s48p-256g--a11 index b23cb94..a281e24 100644 --- a/hosts/taishan200-2280-2s48p-256g--a11 +++ b/hosts/taishan200-2280-2s48p-256g--a11 @@ -18,3 +18,4 @@ mac_addr: - cc:05:77:ab:97:68 - cc:05:77:ab:97:69 model_name: Kunpeng-920 +ipmi_ip: 9.3.5.1 diff --git a/hosts/taishan200-2280-2s48p-256g--a13 b/hosts/taishan200-2280-2s48p-256g--a13 index 00b5600..991694c 100644 --- a/hosts/taishan200-2280-2s48p-256g--a13 +++ b/hosts/taishan200-2280-2s48p-256g--a13 @@ -18,3 +18,4 @@ mac_addr: - 44:67:47:97:2b:c5 - 44:67:47:97:2b:c6 model_name: Kunpeng-920 +ipmi_ip: 9.3.5.3 diff --git a/hosts/taishan200-2280-2s48p-256g--a14 b/hosts/taishan200-2280-2s48p-256g--a14 index a473206..d6b2970 100644 --- a/hosts/taishan200-2280-2s48p-256g--a14 +++ b/hosts/taishan200-2280-2s48p-256g--a14 @@ -18,3 +18,4 @@ mac_addr: - 44:67:47:c9:e9:c8 - 44:67:47:c9:e9:c9 model_name: Kunpeng-920 +ipmi_ip: 9.3.5.4 diff --git a/hosts/taishan200-2280-2s48p-256g--a15 b/hosts/taishan200-2280-2s48p-256g--a15 index 2497dd9..d66b003 100644 --- a/hosts/taishan200-2280-2s48p-256g--a15 +++ b/hosts/taishan200-2280-2s48p-256g--a15 @@ -18,3 +18,4 @@ mac_addr: - 44:67:47:85:d4:a4 - 44:67:47:85:d4:a5 model_name: Kunpeng-920 +ipmi_ip: 9.3.5.5 diff --git a/hosts/taishan200-2280-2s48p-256g--a17 b/hosts/taishan200-2280-2s48p-256g--a17 index 9665823..7485faa 100644 --- a/hosts/taishan200-2280-2s48p-256g--a17 +++ b/hosts/taishan200-2280-2s48p-256g--a17 @@ -18,3 +18,4 @@ mac_addr: - 44:67:47:c9:ea:22 - 44:67:47:c9:ea:23 model_name: Kunpeng-920 +ipmi_ip: 9.3.5.7 diff --git a/hosts/taishan200-2280-2s48p-256g--a18 b/hosts/taishan200-2280-2s48p-256g--a18 index b45980d..8673d64 100644 --- a/hosts/taishan200-2280-2s48p-256g--a18 +++ b/hosts/taishan200-2280-2s48p-256g--a18 @@ -18,3 +18,4 @@ mac_addr: - 84:46:fe:3d:a7:ef - 84:46:fe:3d:a7:f0 model_name: Kunpeng-920 +ipmi_ip: 9.3.5.8 diff --git a/hosts/taishan200-2280-2s48p-256g--a19 b/hosts/taishan200-2280-2s48p-256g--a19 index dc79e40..8ffac96 100644 --- a/hosts/taishan200-2280-2s48p-256g--a19 +++ b/hosts/taishan200-2280-2s48p-256g--a19 @@ -18,3 +18,4 @@ mac_addr: - 44:67:47:85:d5:4e - 44:67:47:85:d5:4f model_name: Kunpeng-920 +ipmi_ip: 9.3.5.9 diff --git a/hosts/taishan200-2280-2s48p-256g--a21 b/hosts/taishan200-2280-2s48p-256g--a21 index e357581..b1fae8b 100644 --- a/hosts/taishan200-2280-2s48p-256g--a21 +++ b/hosts/taishan200-2280-2s48p-256g--a21 @@ -18,3 +18,4 @@ mac_addr: - 44:67:47:86:1b:e6 - 44:67:47:86:1b:e7 model_name: Kunpeng-920 +ipmi_ip: 9.3.5.11 diff --git a/hosts/taishan200-2280-2s48p-256g--a22 b/hosts/taishan200-2280-2s48p-256g--a22 index f11922d..2d46733 100644 --- a/hosts/taishan200-2280-2s48p-256g--a22 +++ b/hosts/taishan200-2280-2s48p-256g--a22 @@ -18,3 +18,4 @@ mac_addr: - 44:67:47:d7:6d:1a - 44:67:47:d7:6d:1b model_name: Kunpeng-920 +ipmi_ip: 9.3.5.12 diff --git a/hosts/taishan200-2280-2s48p-256g--a24 b/hosts/taishan200-2280-2s48p-256g--a24 index 4948112..d666366 100644 --- a/hosts/taishan200-2280-2s48p-256g--a24 +++ b/hosts/taishan200-2280-2s48p-256g--a24 @@ -18,3 +18,4 @@ mac_addr: - 44:67:47:c9:d8:fa - 44:67:47:c9:d8:fb model_name: Kunpeng-920 +ipmi_ip: 9.3.9.1 diff --git a/hosts/taishan200-2280-2s48p-256g--a25 b/hosts/taishan200-2280-2s48p-256g--a25 index ee5eeb3..8e43697 100644 --- a/hosts/taishan200-2280-2s48p-256g--a25 +++ b/hosts/taishan200-2280-2s48p-256g--a25 @@ -18,3 +18,4 @@ mac_addr: - 44:67:47:c9:ea:0e - 44:67:47:c9:ea:0f model_name: Kunpeng-920 +ipmi_ip: 9.3.9.2 diff --git a/hosts/taishan200-2280-2s48p-256g--a26 b/hosts/taishan200-2280-2s48p-256g--a26 index 0c65a11..15cc4e0 100644 --- a/hosts/taishan200-2280-2s48p-256g--a26 +++ b/hosts/taishan200-2280-2s48p-256g--a26 @@ -18,3 +18,4 @@ mac_addr: - 44:67:47:c9:e9:46 - 44:67:47:c9:e9:47 model_name: Kunpeng-920 +ipmi_ip: 9.3.9.3 diff --git a/hosts/taishan200-2280-2s48p-256g--a27 b/hosts/taishan200-2280-2s48p-256g--a27 index 496b967..e6b3135 100644 --- a/hosts/taishan200-2280-2s48p-256g--a27 +++ b/hosts/taishan200-2280-2s48p-256g--a27 @@ -18,3 +18,4 @@ mac_addr: - 44:67:47:d7:6d:42 - 44:67:47:d7:6d:43 model_name: Kunpeng-920 +ipmi_ip: 9.3.9.4 diff --git a/hosts/taishan200-2280-2s48p-256g--a28 b/hosts/taishan200-2280-2s48p-256g--a28 index e20d313..f27d5e0 100644 --- a/hosts/taishan200-2280-2s48p-256g--a28 +++ b/hosts/taishan200-2280-2s48p-256g--a28 @@ -18,3 +18,4 @@ mac_addr: - 5c:e8:83:31:c8:26 - 5c:e8:83:31:c8:27 model_name: Kunpeng-920 +ipmi_ip: 9.3.9.5 diff --git a/hosts/taishan200-2280-2s48p-256g--a29 b/hosts/taishan200-2280-2s48p-256g--a29 index 46f9d3a..74c614f 100644 --- a/hosts/taishan200-2280-2s48p-256g--a29 +++ b/hosts/taishan200-2280-2s48p-256g--a29 @@ -18,3 +18,4 @@ mac_addr: - 44:67:47:c9:d8:f0 - 44:67:47:c9:d8:f1 model_name: Kunpeng-920 +ipmi_ip: 9.3.9.6 diff --git a/hosts/taishan200-2280-2s48p-256g--a30 b/hosts/taishan200-2280-2s48p-256g--a30 index 3920c05..568316f 100644 --- a/hosts/taishan200-2280-2s48p-256g--a30 +++ b/hosts/taishan200-2280-2s48p-256g--a30 @@ -18,3 +18,4 @@ mac_addr: - 44:67:47:86:1b:d2 - 44:67:47:86:1b:d3 model_name: Kunpeng-920 +ipmi_ip: 9.3.9.7 diff --git a/hosts/taishan200-2280-2s48p-256g--a31 b/hosts/taishan200-2280-2s48p-256g--a31 index 552391b..4f49685 100644 --- a/hosts/taishan200-2280-2s48p-256g--a31 +++ b/hosts/taishan200-2280-2s48p-256g--a31 @@ -18,3 +18,4 @@ mac_addr: - 44:67:47:86:1b:b4 - 44:67:47:86:1b:b5 model_name: Kunpeng-920 +ipmi_ip: 9.3.9.8 diff --git a/hosts/taishan200-2280-2s48p-256g--a32 b/hosts/taishan200-2280-2s48p-256g--a32 index a59e1ac..ac0279e 100644 --- a/hosts/taishan200-2280-2s48p-256g--a32 +++ b/hosts/taishan200-2280-2s48p-256g--a32 @@ -18,3 +18,4 @@ mac_addr: - 44:67:47:c9:db:3e - 44:67:47:c9:db:3f model_name: Kunpeng-920 +ipmi_ip: 9.3.9.9 diff --git a/hosts/taishan200-2280-2s48p-256g--a33 b/hosts/taishan200-2280-2s48p-256g--a33 index b4305c9..20b8323 100644 --- a/hosts/taishan200-2280-2s48p-256g--a33 +++ b/hosts/taishan200-2280-2s48p-256g--a33 @@ -18,3 +18,4 @@ mac_addr: - 44:67:47:d7:6c:ca - 44:67:47:d7:6c:cb model_name: Kunpeng-920 +ipmi_ip: 9.3.9.10 diff --git a/hosts/taishan200-2280-2s48p-256g--a34 b/hosts/taishan200-2280-2s48p-256g--a34 index 907e3de..b657141 100644 --- a/hosts/taishan200-2280-2s48p-256g--a34 +++ b/hosts/taishan200-2280-2s48p-256g--a34 @@ -18,3 +18,4 @@ mac_addr: - 44:67:47:c9:d9:2c - 44:67:47:c9:d9:2d model_name: Kunpeng-920 +ipmi_ip: 9.3.9.11 diff --git a/hosts/taishan200-2280-2s48p-256g--a52 b/hosts/taishan200-2280-2s48p-256g--a52 index 7e2c978..339b2a8 100644 --- a/hosts/taishan200-2280-2s48p-256g--a52 +++ b/hosts/taishan200-2280-2s48p-256g--a52 @@ -18,3 +18,4 @@ mac_addr: - 5c:e8:83:31:c8:da - 5c:e8:83:31:c8:db model_name: Kunpeng-920 +ipmi_ip: 9.3.3.5 diff --git a/hosts/taishan200-2280-2s48p-256g--a53 b/hosts/taishan200-2280-2s48p-256g--a53 index 7a2df7c..e1dca3a 100644 --- a/hosts/taishan200-2280-2s48p-256g--a53 +++ b/hosts/taishan200-2280-2s48p-256g--a53 @@ -16,3 +16,4 @@ mac_addr: - 5c:e8:83:73:25:cf - 5c:e8:83:73:25:d0 model_name: Kunpeng-920 +ipmi_ip: 9.3.3.6 diff --git a/hosts/taishan200-2280-2s48p-256g--a60 b/hosts/taishan200-2280-2s48p-256g--a60 index 3a89486..9a92a85 100644 --- a/hosts/taishan200-2280-2s48p-256g--a60 +++ b/hosts/taishan200-2280-2s48p-256g--a60 @@ -18,3 +18,4 @@ mac_addr: - e0:00:84:2b:51:83 - e0:00:84:2b:51:84 model_name: Kunpeng-920 +ipmi_ip: 9.3.4.1 diff --git a/hosts/taishan200-2280-2s48p-256g--a61 b/hosts/taishan200-2280-2s48p-256g--a61 index 7a95471..bef5d8a 100644 --- a/hosts/taishan200-2280-2s48p-256g--a61 +++ b/hosts/taishan200-2280-2s48p-256g--a61 @@ -18,3 +18,4 @@ mac_addr: - 44:67:47:c9:e4:be - 44:67:47:c9:e4:bf model_name: Kunpeng-920 +ipmi_ip: 9.3.4.2 diff --git a/hosts/taishan200-2280-2s48p-256g--a62 b/hosts/taishan200-2280-2s48p-256g--a62 index 6451dc4..b41eaf7 100644 --- a/hosts/taishan200-2280-2s48p-256g--a62 +++ b/hosts/taishan200-2280-2s48p-256g--a62 @@ -18,3 +18,4 @@ mac_addr: - 44:67:47:c9:e3:40 - 44:67:47:c9:e3:41 model_name: Kunpeng-920 +ipmi_ip: 9.3.4.3 diff --git a/hosts/taishan200-2280-2s48p-256g--a66 b/hosts/taishan200-2280-2s48p-256g--a66 index 881f2d6..c9fb714 100644 --- a/hosts/taishan200-2280-2s48p-256g--a66 +++ b/hosts/taishan200-2280-2s48p-256g--a66 @@ -18,3 +18,4 @@ mac_addr: - 5c:e8:83:31:c8:94 - 5c:e8:83:31:c8:95 model_name: Kunpeng-920 +ipmi_ip: 9.3.4.7 diff --git a/hosts/taishan200-2280-2s48p-256g--a67 b/hosts/taishan200-2280-2s48p-256g--a67 index d23d755..a5ab220 100644 --- a/hosts/taishan200-2280-2s48p-256g--a67 +++ b/hosts/taishan200-2280-2s48p-256g--a67 @@ -18,3 +18,4 @@ mac_addr: - 44:67:47:c9:e2:32 - 44:67:47:c9:e2:33 model_name: Kunpeng-920 +ipmi_ip: 9.3.4.8 diff --git a/hosts/taishan200-2280-2s48p-256g--a68 b/hosts/taishan200-2280-2s48p-256g--a68 index 0ceb191..afd0101 100644 --- a/hosts/taishan200-2280-2s48p-256g--a68 +++ b/hosts/taishan200-2280-2s48p-256g--a68 @@ -18,3 +18,4 @@ mac_addr: - 84:46:fe:89:b6:ec - 84:46:fe:89:b6:ed model_name: Kunpeng-920 +ipmi_ip: 9.3.4.9 diff --git a/hosts/taishan200-2280-2s48p-256g--a69 b/hosts/taishan200-2280-2s48p-256g--a69 index 5e948ee..8ac90cc 100644 --- a/hosts/taishan200-2280-2s48p-256g--a69 +++ b/hosts/taishan200-2280-2s48p-256g--a69 @@ -18,3 +18,4 @@ mac_addr: - 44:67:47:c9:d9:54 - 44:67:47:c9:d9:55 model_name: Kunpeng-920 +ipmi_ip: 9.3.4.10 diff --git a/hosts/taishan200-2280-2s48p-256g--a70 b/hosts/taishan200-2280-2s48p-256g--a70 index 760ce0c..463febf 100644 --- a/hosts/taishan200-2280-2s48p-256g--a70 +++ b/hosts/taishan200-2280-2s48p-256g--a70 @@ -18,3 +18,4 @@ mac_addr: - 84:46:fe:89:b7:28 - 84:46:fe:89:b7:29 model_name: Kunpeng-920 +ipmi_ip: 9.3.4.11 diff --git a/hosts/taishan200-2280-2s48p-256g--a71 b/hosts/taishan200-2280-2s48p-256g--a71 index dde6205..501ea4b 100644 --- a/hosts/taishan200-2280-2s48p-256g--a71 +++ b/hosts/taishan200-2280-2s48p-256g--a71 @@ -11,3 +11,4 @@ mac_addr: - 44:67:47:d7:6d:ec - 44:67:47:d7:6d:ed model_name: Kunpeng-920 +ipmi_ip: 9.3.4.12 diff --git a/hosts/taishan200-2280-2s64p-256g--a10 b/hosts/taishan200-2280-2s64p-256g--a10 index 6e8aec7..f99a406 100644 --- a/hosts/taishan200-2280-2s64p-256g--a10 +++ b/hosts/taishan200-2280-2s64p-256g--a10 @@ -20,3 +20,4 @@ mac_addr: - ac:b3:b5:1e:d5:4d - ac:b3:b5:1e:d5:4e model_name: Kunpeng-920 +ipmi_ip: 9.3.1.10 diff --git a/hosts/taishan200-2280-2s64p-256g--a3 b/hosts/taishan200-2280-2s64p-256g--a3 index 1bdadca..744978e 100644 --- a/hosts/taishan200-2280-2s64p-256g--a3 +++ b/hosts/taishan200-2280-2s64p-256g--a3 @@ -22,3 +22,4 @@ mac_addr: - ac:b3:b5:1f:74:f0 - ac:b3:b5:1f:74:f1 model_name: Kunpeng-920 +ipmi_ip: 9.3.1.3 diff --git a/hosts/taishan200-2280-2s64p-256g--a36 b/hosts/taishan200-2280-2s64p-256g--a36 index 1fb15d4..51ba3a4 100644 --- a/hosts/taishan200-2280-2s64p-256g--a36 +++ b/hosts/taishan200-2280-2s64p-256g--a36 @@ -21,3 +21,4 @@ mac_addr: - ac:b3:b5:1e:bd:bd - ac:b3:b5:1e:bd:be model_name: Kunpeng-920 +ipmi_ip: 9.3.2.1 diff --git a/hosts/taishan200-2280-2s64p-256g--a4 b/hosts/taishan200-2280-2s64p-256g--a4 index 8ef481c..0f73c52 100644 --- a/hosts/taishan200-2280-2s64p-256g--a4 +++ b/hosts/taishan200-2280-2s64p-256g--a4 @@ -22,3 +22,4 @@ mac_addr: - ac:b3:b5:1f:7d:50 - ac:b3:b5:1f:7d:51 model_name: Kunpeng-920 +ipmi_ip: 9.3.1.4 diff --git a/hosts/taishan200-2280-2s64p-256g--a40 b/hosts/taishan200-2280-2s64p-256g--a40 index 6040f4f..6825c38 100644 --- a/hosts/taishan200-2280-2s64p-256g--a40 +++ b/hosts/taishan200-2280-2s64p-256g--a40 @@ -20,3 +20,4 @@ mac_addr: - ac:b3:b5:1e:d6:cd - ac:b3:b5:1e:d6:ce model_name: Kunpeng-920 +ipmi_ip: 9.3.2.5 diff --git a/hosts/taishan200-2280-2s64p-256g--a41 b/hosts/taishan200-2280-2s64p-256g--a41 index fadeadd..5937093 100644 --- a/hosts/taishan200-2280-2s64p-256g--a41 +++ b/hosts/taishan200-2280-2s64p-256g--a41 @@ -20,3 +20,4 @@ mac_addr: - ac:b3:b5:1e:b7:5d - ac:b3:b5:1e:b7:5e model_name: Kunpeng-920 +ipmi_ip: 9.3.2.6 diff --git a/hosts/taishan200-2280-2s64p-256g--a42 b/hosts/taishan200-2280-2s64p-256g--a42 index 81ec475..1f5d3f0 100644 --- a/hosts/taishan200-2280-2s64p-256g--a42 +++ b/hosts/taishan200-2280-2s64p-256g--a42 @@ -20,3 +20,4 @@ mac_addr: - 44:a1:91:35:68:d2 - 44:a1:91:35:68:d3 model_name: Kunpeng-920 +ipmi_ip: 9.3.2.7 diff --git a/hosts/taishan200-2280-2s64p-256g--a8 b/hosts/taishan200-2280-2s64p-256g--a8 index fd22672..64f2750 100644 --- a/hosts/taishan200-2280-2s64p-256g--a8 +++ b/hosts/taishan200-2280-2s64p-256g--a8 @@ -13,3 +13,4 @@ mac_addr: - ac:b3:b5:1e:b6:7d - ac:b3:b5:1e:b6:7e model_name: Kunpeng-920 +ipmi_ip: 9.3.1.8 diff --git a/hosts/taishan200-2280-2s64p-256g--a9 b/hosts/taishan200-2280-2s64p-256g--a9 index d6c4353..b21e4d3 100644 --- a/hosts/taishan200-2280-2s64p-256g--a9 +++ b/hosts/taishan200-2280-2s64p-256g--a9 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 128 -memory: 128G +memory: 256G nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-35000c500bd6a1347 @@ -16,3 +16,4 @@ mac_addr: - 44:a1:91:35:1a:72 - 44:a1:91:35:1a:73 model_name: Kunpeng-920 +ipmi_ip: 9.3.1.9 -- 2.23.0

1 0

[PATCH lab-z9 1/4] hosts file add ipmi_ip
by Zhang Dewan 15 Oct '20

15 Oct '20

--- hosts/0001-add-new-hosts-file.patch | 913 ++++++++++++++++++ ...and-the-128G-s-host-will-be-added-to.patch | 454 +++++++++ hosts/0003-hosts-file-add-ipmi_ip.patch | 411 ++++++++ hosts/taishan200-2280-2s64p-256g--a9 | 2 +- 4 files changed, 1779 insertions(+), 1 deletion(-) create mode 100644 hosts/0001-add-new-hosts-file.patch create mode 100644 hosts/0002-fix-memory-size-and-the-128G-s-host-will-be-added-to.patch create mode 100644 hosts/0003-hosts-file-add-ipmi_ip.patch diff --git a/hosts/0001-add-new-hosts-file.patch b/hosts/0001-add-new-hosts-file.patch new file mode 100644 index 0000000..18318eb --- /dev/null +++ b/hosts/0001-add-new-hosts-file.patch @@ -0,0 +1,913 @@ +From bdf38f06d38302d4510387bc41b1bdce52518665 Mon Sep 17 00:00:00 2001 +From: Zhang Dewan <513619464(a)qq.com> +Date: Fri, 9 Oct 2020 19:14:31 +0800 +Subject: [PATCH lab-z9 1/3] add new hosts file + +--- + hosts/taishan200-2280-2s48p-256g--a13 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a14 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a15 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a17 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a18 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a19 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a21 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a22 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a24 | 7 +++---- + hosts/taishan200-2280-2s48p-256g--a25 | 5 ++--- + hosts/taishan200-2280-2s48p-256g--a26 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a27 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a28 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a29 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a30 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a31 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a32 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a33 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a34 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a52 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a53 | 17 +++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a60 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a61 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a62 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a66 | 5 ++--- + hosts/taishan200-2280-2s48p-256g--a67 | 5 ++--- + hosts/taishan200-2280-2s48p-256g--a68 | 5 ++--- + hosts/taishan200-2280-2s48p-256g--a69 | 5 ++--- + hosts/taishan200-2280-2s48p-256g--a70 | 5 ++--- + hosts/taishan200-2280-2s48p-256g--a71 | 2 +- + hosts/taishan200-2280-2s64p-256g--a10 | 8 ++++++-- + hosts/taishan200-2280-2s64p-256g--a36 | 24 ++++++++++++++++++++++++ + hosts/taishan200-2280-2s64p-256g--a40 | 21 +++++++++++++++++++++ + hosts/taishan200-2280-2s64p-256g--a41 | 21 +++++++++++++++++++++ + hosts/taishan200-2280-2s64p-256g--a42 | 21 +++++++++++++++++++++ + hosts/taishan200-2280-2s64p-256g--a9 | 5 ++--- + 36 files changed, 527 insertions(+), 28 deletions(-) + create mode 100644 hosts/taishan200-2280-2s48p-256g--a13 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a14 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a15 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a17 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a18 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a19 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a21 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a22 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a26 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a27 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a28 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a29 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a30 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a31 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a32 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a33 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a34 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a52 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a53 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a60 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a61 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a62 + create mode 100644 hosts/taishan200-2280-2s64p-256g--a36 + create mode 100644 hosts/taishan200-2280-2s64p-256g--a40 + create mode 100644 hosts/taishan200-2280-2s64p-256g--a41 + create mode 100644 hosts/taishan200-2280-2s64p-256g--a42 + +diff --git a/hosts/taishan200-2280-2s48p-256g--a13 b/hosts/taishan200-2280-2s48p-256g--a13 +new file mode 100644 +index 0000000..1c8f554 +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a13 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-35000c500c2799bb3 ++ - /dev/disk/by-id/scsi-35000c500c278b18b ++ - /dev/disk/by-id/scsi-35000c500c279f96b ++ - /dev/disk/by-id/scsi-35000c500c2789b4b ++mac_addr: ++ - 44:67:47:97:2b:bf ++ - 44:67:47:97:2b:c0 ++ - 44:67:47:97:2b:c1 ++ - 44:67:47:97:2b:c2 ++ - 44:67:47:97:2b:c3 ++ - 44:67:47:97:2b:c4 ++ - 44:67:47:97:2b:c5 ++ - 44:67:47:97:2b:c6 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a14 b/hosts/taishan200-2280-2s48p-256g--a14 +new file mode 100644 +index 0000000..ae84bd5 +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a14 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b88b4475 ++ - /dev/disk/by-id/scsi-350000399b88b4371 ++ - /dev/disk/by-id/scsi-350000399b88b432d ++ - /dev/disk/by-id/scsi-350000399b88b4531 ++mac_addr: ++ - 44:67:47:c9:e9:c2 ++ - 44:67:47:c9:e9:c3 ++ - 44:67:47:c9:e9:c4 ++ - 44:67:47:c9:e9:c5 ++ - 44:67:47:c9:e9:c6 ++ - 44:67:47:c9:e9:c7 ++ - 44:67:47:c9:e9:c8 ++ - 44:67:47:c9:e9:c9 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a15 b/hosts/taishan200-2280-2s48p-256g--a15 +new file mode 100644 +index 0000000..7fa0b67 +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a15 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b841fff5 ++ - /dev/disk/by-id/scsi-350000399b841fcb9 ++ - /dev/disk/by-id/scsi-350000399b8420a0d ++ - /dev/disk/by-id/scsi-350000399b841ff55 ++mac_addr: ++ - 44:67:47:85:d4:9e ++ - 44:67:47:85:d4:9f ++ - 44:67:47:85:d4:a0 ++ - 44:67:47:85:d4:a1 ++ - 44:67:47:85:d4:a2 ++ - 44:67:47:85:d4:a3 ++ - 44:67:47:85:d4:a4 ++ - 44:67:47:85:d4:a5 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a17 b/hosts/taishan200-2280-2s48p-256g--a17 +new file mode 100644 +index 0000000..8be93de +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a17 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b88b44cd ++ - /dev/disk/by-id/scsi-350000399b88b4541 ++ - /dev/disk/by-id/scsi-350000399b88b4495 ++ - /dev/disk/by-id/scsi-350000399b88b48d1 ++mac_addr: ++ - 44:67:47:c9:ea:1c ++ - 44:67:47:c9:ea:1d ++ - 44:67:47:c9:ea:1e ++ - 44:67:47:c9:ea:1f ++ - 44:67:47:c9:ea:20 ++ - 44:67:47:c9:ea:21 ++ - 44:67:47:c9:ea:22 ++ - 44:67:47:c9:ea:23 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a18 b/hosts/taishan200-2280-2s48p-256g--a18 +new file mode 100644 +index 0000000..e86bdeb +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a18 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b891b4d1 ++ - /dev/disk/by-id/scsi-350000399b8890d59 ++ - /dev/disk/by-id/scsi-350000399b8890f65 ++ - /dev/disk/by-id/scsi-350000399b891b3c5 ++mac_addr: ++ - 84:46:fe:3d:a7:e9 ++ - 84:46:fe:3d:a7:ea ++ - 84:46:fe:3d:a7:eb ++ - 84:46:fe:3d:a7:ec ++ - 84:46:fe:3d:a7:ed ++ - 84:46:fe:3d:a7:ee ++ - 84:46:fe:3d:a7:ef ++ - 84:46:fe:3d:a7:f0 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a19 b/hosts/taishan200-2280-2s48p-256g--a19 +new file mode 100644 +index 0000000..0c4a60f +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a19 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b8923939 ++ - /dev/disk/by-id/scsi-350000399b8420b2d ++ - /dev/disk/by-id/scsi-350000399b891b5c5 ++ - /dev/disk/by-id/scsi-350000399b841f769 ++mac_addr: ++ - 44:67:47:85:d5:48 ++ - 44:67:47:85:d5:49 ++ - 44:67:47:85:d5:4a ++ - 44:67:47:85:d5:4b ++ - 44:67:47:85:d5:4c ++ - 44:67:47:85:d5:4d ++ - 44:67:47:85:d5:4e ++ - 44:67:47:85:d5:4f ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a21 b/hosts/taishan200-2280-2s48p-256g--a21 +new file mode 100644 +index 0000000..51b7709 +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a21 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b88bf2d5 ++ - /dev/disk/by-id/scsi-350000399b88bf5a5 ++ - /dev/disk/by-id/scsi-350000399b88bf279 ++ - /dev/disk/by-id/scsi-350000399b88bf24d ++mac_addr: ++ - 44:67:47:86:1b:e0 ++ - 44:67:47:86:1b:e1 ++ - 44:67:47:86:1b:e2 ++ - 44:67:47:86:1b:e3 ++ - 44:67:47:86:1b:e4 ++ - 44:67:47:86:1b:e5 ++ - 44:67:47:86:1b:e6 ++ - 44:67:47:86:1b:e7 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a22 b/hosts/taishan200-2280-2s48p-256g--a22 +new file mode 100644 +index 0000000..4de0ad0 +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a22 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b8919069 ++ - /dev/disk/by-id/scsi-350000399b8918c15 ++ - /dev/disk/by-id/scsi-350000399b8918c79 ++ - /dev/disk/by-id/scsi-350000399b8918cb9 ++mac_addr: ++ - 44:67:47:d7:6d:14 ++ - 44:67:47:d7:6d:15 ++ - 44:67:47:d7:6d:16 ++ - 44:67:47:d7:6d:17 ++ - 44:67:47:d7:6d:18 ++ - 44:67:47:d7:6d:19 ++ - 44:67:47:d7:6d:1a ++ - 44:67:47:d7:6d:1b ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a24 b/hosts/taishan200-2280-2s48p-256g--a24 +index f46bfab..f47947c 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a24 ++++ b/hosts/taishan200-2280-2s48p-256g--a24 +@@ -1,12 +1,11 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 256G +-nr_hdd_partitions: 3 ++memory: 252G ++nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8917d59 +- - /dev/disk/by-id/scsi-350000399b891790d + - /dev/disk/by-id/scsi-350000399b89185d9 +-rootfs_partition: ++ - /dev/disk/by-id/scsi-350000399b891790d + - /dev/disk/by-id/scsi-350000399b8917ef1 + mac_addr: + - 44:67:47:c9:d8:f4 +diff --git a/hosts/taishan200-2280-2s48p-256g--a25 b/hosts/taishan200-2280-2s48p-256g--a25 +index ee5eeb3..2f270e8 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a25 ++++ b/hosts/taishan200-2280-2s48p-256g--a25 +@@ -1,12 +1,11 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 256G +-nr_hdd_partitions: 3 ++memory: 252G ++nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88b4499 + - /dev/disk/by-id/scsi-350000399b88b4455 + - /dev/disk/by-id/scsi-350000399b88b442d +-rootfs_partition: + - /dev/disk/by-id/scsi-350000399b88b44f9 + mac_addr: + - 44:67:47:c9:ea:08 +diff --git a/hosts/taishan200-2280-2s48p-256g--a26 b/hosts/taishan200-2280-2s48p-256g--a26 +new file mode 100644 +index 0000000..b6de96e +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a26 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b88bf131 ++ - /dev/disk/by-id/scsi-350000399b88bfd8d ++ - /dev/disk/by-id/scsi-350000399b88bfe55 ++ - /dev/disk/by-id/scsi-350000399b88bef31 ++mac_addr: ++ - 44:67:47:c9:e9:40 ++ - 44:67:47:c9:e9:41 ++ - 44:67:47:c9:e9:42 ++ - 44:67:47:c9:e9:43 ++ - 44:67:47:c9:e9:44 ++ - 44:67:47:c9:e9:45 ++ - 44:67:47:c9:e9:46 ++ - 44:67:47:c9:e9:47 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a27 b/hosts/taishan200-2280-2s48p-256g--a27 +new file mode 100644 +index 0000000..b6d9945 +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a27 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b8918ea9 ++ - /dev/disk/by-id/scsi-350000399b8918bad ++ - /dev/disk/by-id/scsi-350000399b8918d05 ++ - /dev/disk/by-id/scsi-350000399b8919415 ++mac_addr: ++ - 44:67:47:d7:6d:3c ++ - 44:67:47:d7:6d:3d ++ - 44:67:47:d7:6d:3e ++ - 44:67:47:d7:6d:3f ++ - 44:67:47:d7:6d:40 ++ - 44:67:47:d7:6d:41 ++ - 44:67:47:d7:6d:42 ++ - 44:67:47:d7:6d:43 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a28 b/hosts/taishan200-2280-2s48p-256g--a28 +new file mode 100644 +index 0000000..ecebafc +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a28 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-35000c500cdf1eb07 ++ - /dev/disk/by-id/scsi-35000c500cdef4c6f ++ - /dev/disk/by-id/scsi-35000c500cdefac2b ++ - /dev/disk/by-id/scsi-35000c500cdefa75f ++mac_addr: ++ - 5c:e8:83:31:c8:20 ++ - 5c:e8:83:31:c8:21 ++ - 5c:e8:83:31:c8:22 ++ - 5c:e8:83:31:c8:23 ++ - 5c:e8:83:31:c8:24 ++ - 5c:e8:83:31:c8:25 ++ - 5c:e8:83:31:c8:26 ++ - 5c:e8:83:31:c8:27 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a29 b/hosts/taishan200-2280-2s48p-256g--a29 +new file mode 100644 +index 0000000..bdb13ca +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a29 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b8918425 ++ - /dev/disk/by-id/scsi-350000399b891841d ++ - /dev/disk/by-id/scsi-350000399b8917859 ++ - /dev/disk/by-id/scsi-350000399b8917a51 ++mac_addr: ++ - 44:67:47:c9:d8:ea ++ - 44:67:47:c9:d8:eb ++ - 44:67:47:c9:d8:ec ++ - 44:67:47:c9:d8:ed ++ - 44:67:47:c9:d8:ee ++ - 44:67:47:c9:d8:ef ++ - 44:67:47:c9:d8:f0 ++ - 44:67:47:c9:d8:f1 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a30 b/hosts/taishan200-2280-2s48p-256g--a30 +new file mode 100644 +index 0000000..810859b +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a30 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b883b881 ++ - /dev/disk/by-id/scsi-350000399b88bf83d ++ - /dev/disk/by-id/scsi-350000399b883bbbd ++ - /dev/disk/by-id/scsi-350000399b88bf48d ++mac_addr: ++ - 44:67:47:86:1b:cc ++ - 44:67:47:86:1b:cd ++ - 44:67:47:86:1b:ce ++ - 44:67:47:86:1b:cf ++ - 44:67:47:86:1b:d0 ++ - 44:67:47:86:1b:d1 ++ - 44:67:47:86:1b:d2 ++ - 44:67:47:86:1b:d3 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a31 b/hosts/taishan200-2280-2s48p-256g--a31 +new file mode 100644 +index 0000000..8f9d13b +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a31 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b883b929 ++ - /dev/disk/by-id/scsi-350000399b883bbe1 ++ - /dev/disk/by-id/scsi-350000399b883c059 ++ - /dev/disk/by-id/scsi-350000399b883bc9d ++mac_addr: ++ - 44:67:47:86:1b:ae ++ - 44:67:47:86:1b:af ++ - 44:67:47:86:1b:b0 ++ - 44:67:47:86:1b:b1 ++ - 44:67:47:86:1b:b2 ++ - 44:67:47:86:1b:b3 ++ - 44:67:47:86:1b:b4 ++ - 44:67:47:86:1b:b5 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a32 b/hosts/taishan200-2280-2s48p-256g--a32 +new file mode 100644 +index 0000000..66d9b68 +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a32 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b88bf141 ++ - /dev/disk/by-id/scsi-350000399b88bee25 ++ - /dev/disk/by-id/scsi-350000399b88bea59 ++ - /dev/disk/by-id/scsi-350000399b88be1d9 ++mac_addr: ++ - 44:67:47:c9:db:38 ++ - 44:67:47:c9:db:39 ++ - 44:67:47:c9:db:3a ++ - 44:67:47:c9:db:3b ++ - 44:67:47:c9:db:3c ++ - 44:67:47:c9:db:3d ++ - 44:67:47:c9:db:3e ++ - 44:67:47:c9:db:3f ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a33 b/hosts/taishan200-2280-2s48p-256g--a33 +new file mode 100644 +index 0000000..ef3b148 +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a33 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b8919555 ++ - /dev/disk/by-id/scsi-350000399b8918c4d ++ - /dev/disk/by-id/scsi-350000399b8919c3d ++ - /dev/disk/by-id/scsi-350000399b8919389 ++mac_addr: ++ - 44:67:47:d7:6c:c4 ++ - 44:67:47:d7:6c:c5 ++ - 44:67:47:d7:6c:c6 ++ - 44:67:47:d7:6c:c7 ++ - 44:67:47:d7:6c:c8 ++ - 44:67:47:d7:6c:c9 ++ - 44:67:47:d7:6c:ca ++ - 44:67:47:d7:6c:cb ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a34 b/hosts/taishan200-2280-2s48p-256g--a34 +new file mode 100644 +index 0000000..528ec82 +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a34 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b88be219 ++ - /dev/disk/by-id/scsi-350000399b88bdf71 ++ - /dev/disk/by-id/scsi-350000399b88bdb49 ++ - /dev/disk/by-id/scsi-350000399b891784d ++mac_addr: ++ - 44:67:47:c9:d9:26 ++ - 44:67:47:c9:d9:27 ++ - 44:67:47:c9:d9:28 ++ - 44:67:47:c9:d9:29 ++ - 44:67:47:c9:d9:2a ++ - 44:67:47:c9:d9:2b ++ - 44:67:47:c9:d9:2c ++ - 44:67:47:c9:d9:2d ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a52 b/hosts/taishan200-2280-2s48p-256g--a52 +new file mode 100644 +index 0000000..4353d4c +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a52 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-35000c500cdefd89b ++ - /dev/disk/by-id/scsi-35000c500cdefac67 ++ - /dev/disk/by-id/scsi-35000c500cdedee6f ++ - /dev/disk/by-id/scsi-35000c500cdedfdaf ++mac_addr: ++ - 5c:e8:83:31:c8:d4 ++ - 5c:e8:83:31:c8:d5 ++ - 5c:e8:83:31:c8:d6 ++ - 5c:e8:83:31:c8:d7 ++ - 5c:e8:83:31:c8:d8 ++ - 5c:e8:83:31:c8:d9 ++ - 5c:e8:83:31:c8:da ++ - 5c:e8:83:31:c8:db ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a53 b/hosts/taishan200-2280-2s48p-256g--a53 +new file mode 100644 +index 0000000..0df1cd9 +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a53 +@@ -0,0 +1,17 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 2 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-35000c500bd6aa4e3 ++ - /dev/disk/by-id/scsi-35000c500bd681acf ++mac_addr: ++ - 5c:e8:83:73:25:c9 ++ - 5c:e8:83:73:25:ca ++ - 5c:e8:83:73:25:cb ++ - 5c:e8:83:73:25:cc ++ - 5c:e8:83:73:25:cd ++ - 5c:e8:83:73:25:ce ++ - 5c:e8:83:73:25:cf ++ - 5c:e8:83:73:25:d0 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a60 b/hosts/taishan200-2280-2s48p-256g--a60 +new file mode 100644 +index 0000000..6986a8f +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a60 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-35000c500bd67640b ++ - /dev/disk/by-id/scsi-35000c500bd6707a7 ++ - /dev/disk/by-id/scsi-35000c500bd680dc3 ++ - /dev/disk/by-id/scsi-35000c500bd683a73 ++mac_addr: ++ - e0:00:84:2b:51:7d ++ - e0:00:84:2b:51:7e ++ - e0:00:84:2b:51:7f ++ - e0:00:84:2b:51:80 ++ - e0:00:84:2b:51:81 ++ - e0:00:84:2b:51:82 ++ - e0:00:84:2b:51:83 ++ - e0:00:84:2b:51:84 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a61 b/hosts/taishan200-2280-2s48p-256g--a61 +new file mode 100644 +index 0000000..1c198b8 +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a61 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399886a7869 ++ - /dev/disk/by-id/scsi-350000399886acc5d ++ - /dev/disk/by-id/scsi-350000399886b6861 ++ - /dev/disk/by-id/scsi-350000399886ac70d ++mac_addr: ++ - 44:67:47:c9:e4:b8 ++ - 44:67:47:c9:e4:b9 ++ - 44:67:47:c9:e4:ba ++ - 44:67:47:c9:e4:bb ++ - 44:67:47:c9:e4:bc ++ - 44:67:47:c9:e4:bd ++ - 44:67:47:c9:e4:be ++ - 44:67:47:c9:e4:bf ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a62 b/hosts/taishan200-2280-2s48p-256g--a62 +new file mode 100644 +index 0000000..26ab646 +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a62 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b892d131 ++ - /dev/disk/by-id/scsi-350000399b892d619 ++ - /dev/disk/by-id/scsi-350000399b892dc1d ++ - /dev/disk/by-id/scsi-350000399b892dbb5 ++mac_addr: ++ - 44:67:47:c9:e3:3a ++ - 44:67:47:c9:e3:3b ++ - 44:67:47:c9:e3:3c ++ - 44:67:47:c9:e3:3d ++ - 44:67:47:c9:e3:3e ++ - 44:67:47:c9:e3:3f ++ - 44:67:47:c9:e3:40 ++ - 44:67:47:c9:e3:41 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a66 b/hosts/taishan200-2280-2s48p-256g--a66 +index 881f2d6..c7b2083 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a66 ++++ b/hosts/taishan200-2280-2s48p-256g--a66 +@@ -1,12 +1,11 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 256G +-nr_hdd_partitions: 3 ++memory: 252G ++nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-35000c5009a671773 + - /dev/disk/by-id/scsi-35000c5009a690c53 + - /dev/disk/by-id/scsi-35000c5009a6713fb +-rootfs_partition: + - /dev/disk/by-id/scsi-35000c5009a65963f + mac_addr: + - 5c:e8:83:31:c8:8e +diff --git a/hosts/taishan200-2280-2s48p-256g--a67 b/hosts/taishan200-2280-2s48p-256g--a67 +index d23d755..f207003 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a67 ++++ b/hosts/taishan200-2280-2s48p-256g--a67 +@@ -1,12 +1,11 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 256G +-nr_hdd_partitions: 3 ++memory: 252G ++nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88aed21 + - /dev/disk/by-id/scsi-350000399b88af325 + - /dev/disk/by-id/scsi-350000399b88af699 +-rootfs_partition: + - /dev/disk/by-id/scsi-350000399b88af421 + mac_addr: + - 44:67:47:c9:e2:2c +diff --git a/hosts/taishan200-2280-2s48p-256g--a68 b/hosts/taishan200-2280-2s48p-256g--a68 +index 0ceb191..054105c 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a68 ++++ b/hosts/taishan200-2280-2s48p-256g--a68 +@@ -1,12 +1,11 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 256G +-nr_hdd_partitions: 3 ++memory: 252G ++nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8909f81 + - /dev/disk/by-id/scsi-350000399b8909f79 + - /dev/disk/by-id/scsi-350000399b8909605 +-rootfs_partition: + - /dev/disk/by-id/scsi-350000399b8909b85 + mac_addr: + - 84:46:fe:89:b6:e6 +diff --git a/hosts/taishan200-2280-2s48p-256g--a69 b/hosts/taishan200-2280-2s48p-256g--a69 +index 5e948ee..e96e34c 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a69 ++++ b/hosts/taishan200-2280-2s48p-256g--a69 +@@ -1,12 +1,11 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 256G +-nr_hdd_partitions: 3 ++memory: 252G ++nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88be92d + - /dev/disk/by-id/scsi-350000399b88befc5 + - /dev/disk/by-id/scsi-350000399b88be701 +-rootfs_partition: + - /dev/disk/by-id/scsi-350000399b88bea5d + mac_addr: + - 44:67:47:c9:d9:4e +diff --git a/hosts/taishan200-2280-2s48p-256g--a70 b/hosts/taishan200-2280-2s48p-256g--a70 +index 760ce0c..61f99a3 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a70 ++++ b/hosts/taishan200-2280-2s48p-256g--a70 +@@ -1,12 +1,11 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 256G +-nr_hdd_partitions: 3 ++memory: 252G ++nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b890931d + - /dev/disk/by-id/scsi-350000399b8909d79 + - /dev/disk/by-id/scsi-350000399b8909ac5 +-rootfs_partition: + - /dev/disk/by-id/scsi-350000399b8909c99 + mac_addr: + - 84:46:fe:89:b7:22 +diff --git a/hosts/taishan200-2280-2s48p-256g--a71 b/hosts/taishan200-2280-2s48p-256g--a71 +index dde6205..4896475 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a71 ++++ b/hosts/taishan200-2280-2s48p-256g--a71 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 256G ++memory: 252G + mac_addr: + - 44:67:47:d7:6d:e6 + - 44:67:47:d7:6d:e7 +diff --git a/hosts/taishan200-2280-2s64p-256g--a10 b/hosts/taishan200-2280-2s64p-256g--a10 +index 15a9315..a66bff0 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a10 ++++ b/hosts/taishan200-2280-2s64p-256g--a10 +@@ -1,7 +1,11 @@ + nr_node: 4 + nr_cpu: 128 +-memory: 256G +-rootfs_partition: ++memory: 252G ++nr_hdd_partitions: 1 ++nr_ssd_partitions: 1 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399c8030fd5 ++ssd_partitions: + - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB44333 + mac_addr: + - 44:67:47:86:2c:95 +diff --git a/hosts/taishan200-2280-2s64p-256g--a36 b/hosts/taishan200-2280-2s64p-256g--a36 +new file mode 100644 +index 0000000..d9f1184 +--- /dev/null ++++ b/hosts/taishan200-2280-2s64p-256g--a36 +@@ -0,0 +1,24 @@ ++nr_node: 4 ++nr_cpu: 128 ++memory: 255G ++nr_hdd_partitions: 1 ++nr_ssd_partitions: 1 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-3500003999813487d ++ssd_partitions: ++ - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB42949-part1 ++ - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB42949-part2 ++mac_addr: ++ - 84:46:fe:73:b2:75 ++ - 84:46:fe:73:b2:76 ++ - 84:46:fe:73:b2:77 ++ - 84:46:fe:73:b2:78 ++ - ac:b3:b5:1e:bd:5b ++ - ac:b3:b5:1e:bd:5c ++ - ac:b3:b5:1e:bd:5d ++ - ac:b3:b5:1e:bd:5e ++ - ac:b3:b5:1e:bd:bb ++ - ac:b3:b5:1e:bd:bc ++ - ac:b3:b5:1e:bd:bd ++ - ac:b3:b5:1e:bd:be ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s64p-256g--a40 b/hosts/taishan200-2280-2s64p-256g--a40 +new file mode 100644 +index 0000000..91f5619 +--- /dev/null ++++ b/hosts/taishan200-2280-2s64p-256g--a40 +@@ -0,0 +1,21 @@ ++nr_node: 4 ++nr_cpu: 128 ++memory: 252G ++nr_hdd_partitions: 2 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-3500003999812ed81 ++ - /dev/disk/by-id/scsi-350000399c8020115 ++mac_addr: ++ - 84:46:fe:89:be:8e ++ - 84:46:fe:89:be:8f ++ - 84:46:fe:89:be:90 ++ - 84:46:fe:89:be:91 ++ - ac:b3:b5:1e:d7:3b ++ - ac:b3:b5:1e:d7:3c ++ - ac:b3:b5:1e:d7:3d ++ - ac:b3:b5:1e:d7:3e ++ - ac:b3:b5:1e:d6:cb ++ - ac:b3:b5:1e:d6:cc ++ - ac:b3:b5:1e:d6:cd ++ - ac:b3:b5:1e:d6:ce ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s64p-256g--a41 b/hosts/taishan200-2280-2s64p-256g--a41 +new file mode 100644 +index 0000000..9525cfd +--- /dev/null ++++ b/hosts/taishan200-2280-2s64p-256g--a41 +@@ -0,0 +1,21 @@ ++nr_node: 4 ++nr_cpu: 128 ++memory: 252G ++nr_hdd_partitions: 2 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b8919495 ++ - /dev/disk/by-id/scsi-35000039998130a85 ++mac_addr: ++ - 84:46:fe:89:bc:4a ++ - 84:46:fe:89:bc:4b ++ - 84:46:fe:89:bc:4c ++ - 84:46:fe:89:bc:4d ++ - ac:b3:b5:1e:b6:db ++ - ac:b3:b5:1e:b6:dc ++ - ac:b3:b5:1e:b6:dd ++ - ac:b3:b5:1e:b6:de ++ - ac:b3:b5:1e:b7:5b ++ - ac:b3:b5:1e:b7:5c ++ - ac:b3:b5:1e:b7:5d ++ - ac:b3:b5:1e:b7:5e ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s64p-256g--a42 b/hosts/taishan200-2280-2s64p-256g--a42 +new file mode 100644 +index 0000000..40c1c4b +--- /dev/null ++++ b/hosts/taishan200-2280-2s64p-256g--a42 +@@ -0,0 +1,21 @@ ++nr_node: 4 ++nr_cpu: 128 ++memory: 252G ++nr_hdd_partitions: 2 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b8918a11 ++ - /dev/disk/by-id/scsi-350000399c802ee75 ++mac_addr: ++ - cc:05:77:fe:d8:64 ++ - cc:05:77:fe:d8:65 ++ - cc:05:77:fe:d8:66 ++ - cc:05:77:fe:d8:67 ++ - 44:a1:91:35:6c:50 ++ - 44:a1:91:35:6c:51 ++ - 44:a1:91:35:6c:52 ++ - 44:a1:91:35:6c:53 ++ - 44:a1:91:35:68:d0 ++ - 44:a1:91:35:68:d1 ++ - 44:a1:91:35:68:d2 ++ - 44:a1:91:35:68:d3 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s64p-256g--a9 b/hosts/taishan200-2280-2s64p-256g--a9 +index d6c4353..e360e88 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a9 ++++ b/hosts/taishan200-2280-2s64p-256g--a9 +@@ -1,10 +1,9 @@ + nr_node: 4 + nr_cpu: 128 +-memory: 128G +-nr_hdd_partitions: 1 ++memory: 126G ++nr_hdd_partitions: 2 + hdd_partitions: + - /dev/disk/by-id/scsi-35000c500bd6a1347 +-rootfs_partition: + - /dev/disk/by-id/scsi-35000c500bd62acb3 + mac_addr: + - cc:05:77:fe:d4:0e +-- +2.23.0 + diff --git a/hosts/0002-fix-memory-size-and-the-128G-s-host-will-be-added-to.patch b/hosts/0002-fix-memory-size-and-the-128G-s-host-will-be-added-to.patch new file mode 100644 index 0000000..f16c13b --- /dev/null +++ b/hosts/0002-fix-memory-size-and-the-128G-s-host-will-be-added-to.patch @@ -0,0 +1,454 @@ +From 5eb020ab8c2591423a1ec55aadf716191ba9b1f3 Mon Sep 17 00:00:00 2001 +From: Zhang Dewan <513619464(a)qq.com> +Date: Sat, 10 Oct 2020 09:44:42 +0800 +Subject: [PATCH lab-z9 2/3] fix memory size, and the 128G's host will be added + to 256G as soon + +--- + hosts/taishan200-2280-2s48p-256g--a13 | 2 +- + hosts/taishan200-2280-2s48p-256g--a14 | 2 +- + hosts/taishan200-2280-2s48p-256g--a15 | 2 +- + hosts/taishan200-2280-2s48p-256g--a17 | 2 +- + hosts/taishan200-2280-2s48p-256g--a18 | 2 +- + hosts/taishan200-2280-2s48p-256g--a19 | 2 +- + hosts/taishan200-2280-2s48p-256g--a21 | 2 +- + hosts/taishan200-2280-2s48p-256g--a22 | 2 +- + hosts/taishan200-2280-2s48p-256g--a24 | 2 +- + hosts/taishan200-2280-2s48p-256g--a25 | 2 +- + hosts/taishan200-2280-2s48p-256g--a26 | 2 +- + hosts/taishan200-2280-2s48p-256g--a27 | 2 +- + hosts/taishan200-2280-2s48p-256g--a28 | 2 +- + hosts/taishan200-2280-2s48p-256g--a29 | 2 +- + hosts/taishan200-2280-2s48p-256g--a30 | 2 +- + hosts/taishan200-2280-2s48p-256g--a31 | 2 +- + hosts/taishan200-2280-2s48p-256g--a32 | 2 +- + hosts/taishan200-2280-2s48p-256g--a33 | 2 +- + hosts/taishan200-2280-2s48p-256g--a34 | 2 +- + hosts/taishan200-2280-2s48p-256g--a52 | 2 +- + hosts/taishan200-2280-2s48p-256g--a53 | 2 +- + hosts/taishan200-2280-2s48p-256g--a60 | 2 +- + hosts/taishan200-2280-2s48p-256g--a61 | 2 +- + hosts/taishan200-2280-2s48p-256g--a62 | 2 +- + hosts/taishan200-2280-2s48p-256g--a66 | 2 +- + hosts/taishan200-2280-2s48p-256g--a67 | 2 +- + hosts/taishan200-2280-2s48p-256g--a68 | 2 +- + hosts/taishan200-2280-2s48p-256g--a69 | 2 +- + hosts/taishan200-2280-2s48p-256g--a70 | 2 +- + hosts/taishan200-2280-2s48p-256g--a71 | 2 +- + hosts/taishan200-2280-2s64p-256g--a10 | 2 +- + hosts/taishan200-2280-2s64p-256g--a40 | 2 +- + hosts/taishan200-2280-2s64p-256g--a41 | 2 +- + hosts/taishan200-2280-2s64p-256g--a42 | 2 +- + 34 files changed, 34 insertions(+), 34 deletions(-) + +diff --git a/hosts/taishan200-2280-2s48p-256g--a13 b/hosts/taishan200-2280-2s48p-256g--a13 +index 1c8f554..fe05233 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a13 ++++ b/hosts/taishan200-2280-2s48p-256g--a13 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + 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 ae84bd5..bd5962b 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a14 ++++ b/hosts/taishan200-2280-2s48p-256g--a14 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + 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 7fa0b67..9b0cd96 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a15 ++++ b/hosts/taishan200-2280-2s48p-256g--a15 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b841fff5 +diff --git a/hosts/taishan200-2280-2s48p-256g--a17 b/hosts/taishan200-2280-2s48p-256g--a17 +index 8be93de..cbbf268 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a17 ++++ b/hosts/taishan200-2280-2s48p-256g--a17 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + 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 e86bdeb..648a1db 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a18 ++++ b/hosts/taishan200-2280-2s48p-256g--a18 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + 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 0c4a60f..2aec477 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a19 ++++ b/hosts/taishan200-2280-2s48p-256g--a19 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + 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 51b7709..9cbb5b5 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a21 ++++ b/hosts/taishan200-2280-2s48p-256g--a21 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + 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 4de0ad0..6af83a7 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a22 ++++ b/hosts/taishan200-2280-2s48p-256g--a22 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + 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 f47947c..dd9b501 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a24 ++++ b/hosts/taishan200-2280-2s48p-256g--a24 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + 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 2f270e8..5d075b9 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a25 ++++ b/hosts/taishan200-2280-2s48p-256g--a25 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + 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 b6de96e..fe395ec 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a26 ++++ b/hosts/taishan200-2280-2s48p-256g--a26 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + 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 b6d9945..63b94f3 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a27 ++++ b/hosts/taishan200-2280-2s48p-256g--a27 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + 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 ecebafc..df048f7 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a28 ++++ b/hosts/taishan200-2280-2s48p-256g--a28 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + 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 bdb13ca..849be55 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a29 ++++ b/hosts/taishan200-2280-2s48p-256g--a29 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + 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 810859b..2be9047 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a30 ++++ b/hosts/taishan200-2280-2s48p-256g--a30 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + 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 8f9d13b..8af7d18 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a31 ++++ b/hosts/taishan200-2280-2s48p-256g--a31 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + 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 66d9b68..fb52e7f 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a32 ++++ b/hosts/taishan200-2280-2s48p-256g--a32 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + 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 ef3b148..4095419 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a33 ++++ b/hosts/taishan200-2280-2s48p-256g--a33 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + 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 528ec82..bae3e58 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a34 ++++ b/hosts/taishan200-2280-2s48p-256g--a34 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88be219 +diff --git a/hosts/taishan200-2280-2s48p-256g--a52 b/hosts/taishan200-2280-2s48p-256g--a52 +index 4353d4c..654b021 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a52 ++++ b/hosts/taishan200-2280-2s48p-256g--a52 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + 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 0df1cd9..a90b8eb 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a53 ++++ b/hosts/taishan200-2280-2s48p-256g--a53 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 2 + 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 6986a8f..b87d962 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a60 ++++ b/hosts/taishan200-2280-2s48p-256g--a60 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + 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 1c198b8..b33712c 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a61 ++++ b/hosts/taishan200-2280-2s48p-256g--a61 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + 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 26ab646..5c3b04d 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a62 ++++ b/hosts/taishan200-2280-2s48p-256g--a62 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b892d131 +diff --git a/hosts/taishan200-2280-2s48p-256g--a66 b/hosts/taishan200-2280-2s48p-256g--a66 +index c7b2083..88ef791 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a66 ++++ b/hosts/taishan200-2280-2s48p-256g--a66 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + 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 f207003..97ea498 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a67 ++++ b/hosts/taishan200-2280-2s48p-256g--a67 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + 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 054105c..f3d50f4 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a68 ++++ b/hosts/taishan200-2280-2s48p-256g--a68 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + 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 e96e34c..9e5734e 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a69 ++++ b/hosts/taishan200-2280-2s48p-256g--a69 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + 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 61f99a3..0dd8208 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a70 ++++ b/hosts/taishan200-2280-2s48p-256g--a70 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + 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 4896475..dde6205 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a71 ++++ b/hosts/taishan200-2280-2s48p-256g--a71 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + mac_addr: + - 44:67:47:d7:6d:e6 + - 44:67:47:d7:6d:e7 +diff --git a/hosts/taishan200-2280-2s64p-256g--a10 b/hosts/taishan200-2280-2s64p-256g--a10 +index a66bff0..4687d1a 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a10 ++++ b/hosts/taishan200-2280-2s64p-256g--a10 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 128 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 1 + nr_ssd_partitions: 1 + hdd_partitions: +diff --git a/hosts/taishan200-2280-2s64p-256g--a40 b/hosts/taishan200-2280-2s64p-256g--a40 +index 91f5619..c0ce550 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a40 ++++ b/hosts/taishan200-2280-2s64p-256g--a40 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 128 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 2 + 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 9525cfd..9e01396 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a41 ++++ b/hosts/taishan200-2280-2s64p-256g--a41 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 128 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 2 + 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 40c1c4b..1a953df 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a42 ++++ b/hosts/taishan200-2280-2s64p-256g--a42 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 128 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 2 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8918a11 +-- +2.23.0 + diff --git a/hosts/0003-hosts-file-add-ipmi_ip.patch b/hosts/0003-hosts-file-add-ipmi_ip.patch new file mode 100644 index 0000000..5201fc3 --- /dev/null +++ b/hosts/0003-hosts-file-add-ipmi_ip.patch @@ -0,0 +1,411 @@ +From 02376f205393290c0fef2452decbe23836362204 Mon Sep 17 00:00:00 2001 +From: Zhang Dewan <513619464(a)qq.com> +Date: Tue, 13 Oct 2020 14:49:53 +0800 +Subject: [PATCH lab-z9 3/3] hosts file add ipmi_ip + +--- + hosts/taishan200-2280-2s48p-256g--a11 | 1 + + hosts/taishan200-2280-2s48p-256g--a13 | 1 + + hosts/taishan200-2280-2s48p-256g--a14 | 1 + + hosts/taishan200-2280-2s48p-256g--a15 | 1 + + hosts/taishan200-2280-2s48p-256g--a17 | 1 + + hosts/taishan200-2280-2s48p-256g--a18 | 1 + + hosts/taishan200-2280-2s48p-256g--a19 | 1 + + hosts/taishan200-2280-2s48p-256g--a21 | 1 + + hosts/taishan200-2280-2s48p-256g--a22 | 1 + + hosts/taishan200-2280-2s48p-256g--a24 | 1 + + hosts/taishan200-2280-2s48p-256g--a25 | 1 + + hosts/taishan200-2280-2s48p-256g--a26 | 1 + + hosts/taishan200-2280-2s48p-256g--a27 | 1 + + hosts/taishan200-2280-2s48p-256g--a28 | 1 + + hosts/taishan200-2280-2s48p-256g--a29 | 1 + + hosts/taishan200-2280-2s48p-256g--a30 | 1 + + hosts/taishan200-2280-2s48p-256g--a31 | 1 + + hosts/taishan200-2280-2s48p-256g--a32 | 1 + + hosts/taishan200-2280-2s48p-256g--a33 | 1 + + hosts/taishan200-2280-2s48p-256g--a34 | 1 + + hosts/taishan200-2280-2s48p-256g--a52 | 1 + + hosts/taishan200-2280-2s48p-256g--a53 | 1 + + hosts/taishan200-2280-2s48p-256g--a60 | 1 + + hosts/taishan200-2280-2s48p-256g--a61 | 1 + + hosts/taishan200-2280-2s48p-256g--a62 | 1 + + hosts/taishan200-2280-2s48p-256g--a66 | 1 + + hosts/taishan200-2280-2s48p-256g--a67 | 1 + + hosts/taishan200-2280-2s48p-256g--a68 | 1 + + hosts/taishan200-2280-2s48p-256g--a69 | 1 + + hosts/taishan200-2280-2s48p-256g--a70 | 1 + + hosts/taishan200-2280-2s48p-256g--a71 | 1 + + hosts/taishan200-2280-2s64p-256g--a10 | 1 + + hosts/taishan200-2280-2s64p-256g--a3 | 1 + + hosts/taishan200-2280-2s64p-256g--a36 | 1 + + hosts/taishan200-2280-2s64p-256g--a4 | 1 + + hosts/taishan200-2280-2s64p-256g--a40 | 1 + + hosts/taishan200-2280-2s64p-256g--a41 | 1 + + hosts/taishan200-2280-2s64p-256g--a42 | 1 + + hosts/taishan200-2280-2s64p-256g--a8 | 1 + + hosts/taishan200-2280-2s64p-256g--a9 | 1 + + 40 files changed, 40 insertions(+) + +diff --git a/hosts/taishan200-2280-2s48p-256g--a11 b/hosts/taishan200-2280-2s48p-256g--a11 +index b23cb94..a281e24 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a11 ++++ b/hosts/taishan200-2280-2s48p-256g--a11 +@@ -18,3 +18,4 @@ mac_addr: + - cc:05:77:ab:97:68 + - cc:05:77:ab:97:69 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.5.1 +diff --git a/hosts/taishan200-2280-2s48p-256g--a13 b/hosts/taishan200-2280-2s48p-256g--a13 +index fe05233..78cd2ee 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a13 ++++ b/hosts/taishan200-2280-2s48p-256g--a13 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:97:2b:c5 + - 44:67:47:97:2b:c6 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.5.3 +diff --git a/hosts/taishan200-2280-2s48p-256g--a14 b/hosts/taishan200-2280-2s48p-256g--a14 +index bd5962b..162e687 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a14 ++++ b/hosts/taishan200-2280-2s48p-256g--a14 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:c9:e9:c8 + - 44:67:47:c9:e9:c9 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.5.4 +diff --git a/hosts/taishan200-2280-2s48p-256g--a15 b/hosts/taishan200-2280-2s48p-256g--a15 +index 9b0cd96..3890ff0 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a15 ++++ b/hosts/taishan200-2280-2s48p-256g--a15 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:85:d4:a4 + - 44:67:47:85:d4:a5 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.5.5 +diff --git a/hosts/taishan200-2280-2s48p-256g--a17 b/hosts/taishan200-2280-2s48p-256g--a17 +index cbbf268..f2146f8 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a17 ++++ b/hosts/taishan200-2280-2s48p-256g--a17 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:c9:ea:22 + - 44:67:47:c9:ea:23 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.5.7 +diff --git a/hosts/taishan200-2280-2s48p-256g--a18 b/hosts/taishan200-2280-2s48p-256g--a18 +index 648a1db..e0ca747 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a18 ++++ b/hosts/taishan200-2280-2s48p-256g--a18 +@@ -17,3 +17,4 @@ mac_addr: + - 84:46:fe:3d:a7:ef + - 84:46:fe:3d:a7:f0 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.5.8 +diff --git a/hosts/taishan200-2280-2s48p-256g--a19 b/hosts/taishan200-2280-2s48p-256g--a19 +index 2aec477..2b3c440 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a19 ++++ b/hosts/taishan200-2280-2s48p-256g--a19 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:85:d5:4e + - 44:67:47:85:d5:4f + model_name: Kunpeng-920 ++ipmi_ip: 9.3.5.9 +diff --git a/hosts/taishan200-2280-2s48p-256g--a21 b/hosts/taishan200-2280-2s48p-256g--a21 +index 9cbb5b5..44c4e64 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a21 ++++ b/hosts/taishan200-2280-2s48p-256g--a21 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:86:1b:e6 + - 44:67:47:86:1b:e7 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.5.11 +diff --git a/hosts/taishan200-2280-2s48p-256g--a22 b/hosts/taishan200-2280-2s48p-256g--a22 +index 6af83a7..b6d10af 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a22 ++++ b/hosts/taishan200-2280-2s48p-256g--a22 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:d7:6d:1a + - 44:67:47:d7:6d:1b + model_name: Kunpeng-920 ++ipmi_ip: 9.3.5.12 +diff --git a/hosts/taishan200-2280-2s48p-256g--a24 b/hosts/taishan200-2280-2s48p-256g--a24 +index dd9b501..5e1571d 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a24 ++++ b/hosts/taishan200-2280-2s48p-256g--a24 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:c9:d8:fa + - 44:67:47:c9:d8:fb + model_name: Kunpeng-920 ++ipmi_ip: 9.3.9.1 +diff --git a/hosts/taishan200-2280-2s48p-256g--a25 b/hosts/taishan200-2280-2s48p-256g--a25 +index 5d075b9..1f3f599 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a25 ++++ b/hosts/taishan200-2280-2s48p-256g--a25 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:c9:ea:0e + - 44:67:47:c9:ea:0f + model_name: Kunpeng-920 ++ipmi_ip: 9.3.9.2 +diff --git a/hosts/taishan200-2280-2s48p-256g--a26 b/hosts/taishan200-2280-2s48p-256g--a26 +index fe395ec..b136009 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a26 ++++ b/hosts/taishan200-2280-2s48p-256g--a26 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:c9:e9:46 + - 44:67:47:c9:e9:47 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.9.3 +diff --git a/hosts/taishan200-2280-2s48p-256g--a27 b/hosts/taishan200-2280-2s48p-256g--a27 +index 63b94f3..96a387d 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a27 ++++ b/hosts/taishan200-2280-2s48p-256g--a27 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:d7:6d:42 + - 44:67:47:d7:6d:43 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.9.4 +diff --git a/hosts/taishan200-2280-2s48p-256g--a28 b/hosts/taishan200-2280-2s48p-256g--a28 +index df048f7..5a4f298 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a28 ++++ b/hosts/taishan200-2280-2s48p-256g--a28 +@@ -17,3 +17,4 @@ mac_addr: + - 5c:e8:83:31:c8:26 + - 5c:e8:83:31:c8:27 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.9.5 +diff --git a/hosts/taishan200-2280-2s48p-256g--a29 b/hosts/taishan200-2280-2s48p-256g--a29 +index 849be55..5b7c0b8 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a29 ++++ b/hosts/taishan200-2280-2s48p-256g--a29 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:c9:d8:f0 + - 44:67:47:c9:d8:f1 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.9.6 +diff --git a/hosts/taishan200-2280-2s48p-256g--a30 b/hosts/taishan200-2280-2s48p-256g--a30 +index 2be9047..2c8d2d3 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a30 ++++ b/hosts/taishan200-2280-2s48p-256g--a30 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:86:1b:d2 + - 44:67:47:86:1b:d3 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.9.7 +diff --git a/hosts/taishan200-2280-2s48p-256g--a31 b/hosts/taishan200-2280-2s48p-256g--a31 +index 8af7d18..9aec903 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a31 ++++ b/hosts/taishan200-2280-2s48p-256g--a31 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:86:1b:b4 + - 44:67:47:86:1b:b5 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.9.8 +diff --git a/hosts/taishan200-2280-2s48p-256g--a32 b/hosts/taishan200-2280-2s48p-256g--a32 +index fb52e7f..d677838 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a32 ++++ b/hosts/taishan200-2280-2s48p-256g--a32 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:c9:db:3e + - 44:67:47:c9:db:3f + model_name: Kunpeng-920 ++ipmi_ip: 9.3.9.9 +diff --git a/hosts/taishan200-2280-2s48p-256g--a33 b/hosts/taishan200-2280-2s48p-256g--a33 +index 4095419..d4df847 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a33 ++++ b/hosts/taishan200-2280-2s48p-256g--a33 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:d7:6c:ca + - 44:67:47:d7:6c:cb + model_name: Kunpeng-920 ++ipmi_ip: 9.3.9.10 +diff --git a/hosts/taishan200-2280-2s48p-256g--a34 b/hosts/taishan200-2280-2s48p-256g--a34 +index bae3e58..680cb6f 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a34 ++++ b/hosts/taishan200-2280-2s48p-256g--a34 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:c9:d9:2c + - 44:67:47:c9:d9:2d + model_name: Kunpeng-920 ++ipmi_ip: 9.3.9.11 +diff --git a/hosts/taishan200-2280-2s48p-256g--a52 b/hosts/taishan200-2280-2s48p-256g--a52 +index 654b021..a64cdec 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a52 ++++ b/hosts/taishan200-2280-2s48p-256g--a52 +@@ -17,3 +17,4 @@ mac_addr: + - 5c:e8:83:31:c8:da + - 5c:e8:83:31:c8:db + model_name: Kunpeng-920 ++ipmi_ip: 9.3.3.5 +diff --git a/hosts/taishan200-2280-2s48p-256g--a53 b/hosts/taishan200-2280-2s48p-256g--a53 +index a90b8eb..148e747 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a53 ++++ b/hosts/taishan200-2280-2s48p-256g--a53 +@@ -15,3 +15,4 @@ mac_addr: + - 5c:e8:83:73:25:cf + - 5c:e8:83:73:25:d0 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.3.6 +diff --git a/hosts/taishan200-2280-2s48p-256g--a60 b/hosts/taishan200-2280-2s48p-256g--a60 +index b87d962..9e969b0 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a60 ++++ b/hosts/taishan200-2280-2s48p-256g--a60 +@@ -17,3 +17,4 @@ mac_addr: + - e0:00:84:2b:51:83 + - e0:00:84:2b:51:84 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.4.1 +diff --git a/hosts/taishan200-2280-2s48p-256g--a61 b/hosts/taishan200-2280-2s48p-256g--a61 +index b33712c..2992c6f 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a61 ++++ b/hosts/taishan200-2280-2s48p-256g--a61 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:c9:e4:be + - 44:67:47:c9:e4:bf + model_name: Kunpeng-920 ++ipmi_ip: 9.3.4.2 +diff --git a/hosts/taishan200-2280-2s48p-256g--a62 b/hosts/taishan200-2280-2s48p-256g--a62 +index 5c3b04d..5262637 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a62 ++++ b/hosts/taishan200-2280-2s48p-256g--a62 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:c9:e3:40 + - 44:67:47:c9:e3:41 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.4.3 +diff --git a/hosts/taishan200-2280-2s48p-256g--a66 b/hosts/taishan200-2280-2s48p-256g--a66 +index 88ef791..b7a3715 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a66 ++++ b/hosts/taishan200-2280-2s48p-256g--a66 +@@ -17,3 +17,4 @@ mac_addr: + - 5c:e8:83:31:c8:94 + - 5c:e8:83:31:c8:95 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.4.7 +diff --git a/hosts/taishan200-2280-2s48p-256g--a67 b/hosts/taishan200-2280-2s48p-256g--a67 +index 97ea498..2501f6e 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a67 ++++ b/hosts/taishan200-2280-2s48p-256g--a67 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:c9:e2:32 + - 44:67:47:c9:e2:33 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.4.8 +diff --git a/hosts/taishan200-2280-2s48p-256g--a68 b/hosts/taishan200-2280-2s48p-256g--a68 +index f3d50f4..c51e348 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a68 ++++ b/hosts/taishan200-2280-2s48p-256g--a68 +@@ -17,3 +17,4 @@ mac_addr: + - 84:46:fe:89:b6:ec + - 84:46:fe:89:b6:ed + model_name: Kunpeng-920 ++ipmi_ip: 9.3.4.9 +diff --git a/hosts/taishan200-2280-2s48p-256g--a69 b/hosts/taishan200-2280-2s48p-256g--a69 +index 9e5734e..964f79e 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a69 ++++ b/hosts/taishan200-2280-2s48p-256g--a69 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:c9:d9:54 + - 44:67:47:c9:d9:55 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.4.10 +diff --git a/hosts/taishan200-2280-2s48p-256g--a70 b/hosts/taishan200-2280-2s48p-256g--a70 +index 0dd8208..2424a9f 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a70 ++++ b/hosts/taishan200-2280-2s48p-256g--a70 +@@ -17,3 +17,4 @@ mac_addr: + - 84:46:fe:89:b7:28 + - 84:46:fe:89:b7:29 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.4.11 +diff --git a/hosts/taishan200-2280-2s48p-256g--a71 b/hosts/taishan200-2280-2s48p-256g--a71 +index dde6205..501ea4b 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a71 ++++ b/hosts/taishan200-2280-2s48p-256g--a71 +@@ -11,3 +11,4 @@ mac_addr: + - 44:67:47:d7:6d:ec + - 44:67:47:d7:6d:ed + model_name: Kunpeng-920 ++ipmi_ip: 9.3.4.12 +diff --git a/hosts/taishan200-2280-2s64p-256g--a10 b/hosts/taishan200-2280-2s64p-256g--a10 +index 4687d1a..fcc6c63 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a10 ++++ b/hosts/taishan200-2280-2s64p-256g--a10 +@@ -21,3 +21,4 @@ mac_addr: + - ac:b3:b5:1e:d5:4d + - ac:b3:b5:1e:d5:4e + model_name: Kunpeng-920 ++ipmi_ip: 9.3.1.10 +diff --git a/hosts/taishan200-2280-2s64p-256g--a3 b/hosts/taishan200-2280-2s64p-256g--a3 +index 1bdadca..744978e 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a3 ++++ b/hosts/taishan200-2280-2s64p-256g--a3 +@@ -22,3 +22,4 @@ mac_addr: + - ac:b3:b5:1f:74:f0 + - ac:b3:b5:1f:74:f1 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.1.3 +diff --git a/hosts/taishan200-2280-2s64p-256g--a36 b/hosts/taishan200-2280-2s64p-256g--a36 +index d9f1184..e04bc3a 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a36 ++++ b/hosts/taishan200-2280-2s64p-256g--a36 +@@ -22,3 +22,4 @@ mac_addr: + - ac:b3:b5:1e:bd:bd + - ac:b3:b5:1e:bd:be + model_name: Kunpeng-920 ++ipmi_ip: 9.3.2.1 +diff --git a/hosts/taishan200-2280-2s64p-256g--a4 b/hosts/taishan200-2280-2s64p-256g--a4 +index 8ef481c..0f73c52 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a4 ++++ b/hosts/taishan200-2280-2s64p-256g--a4 +@@ -22,3 +22,4 @@ mac_addr: + - ac:b3:b5:1f:7d:50 + - ac:b3:b5:1f:7d:51 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.1.4 +diff --git a/hosts/taishan200-2280-2s64p-256g--a40 b/hosts/taishan200-2280-2s64p-256g--a40 +index c0ce550..3172475 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a40 ++++ b/hosts/taishan200-2280-2s64p-256g--a40 +@@ -19,3 +19,4 @@ mac_addr: + - ac:b3:b5:1e:d6:cd + - ac:b3:b5:1e:d6:ce + model_name: Kunpeng-920 ++ipmi_ip: 9.3.2.5 +diff --git a/hosts/taishan200-2280-2s64p-256g--a41 b/hosts/taishan200-2280-2s64p-256g--a41 +index 9e01396..4253e1f 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a41 ++++ b/hosts/taishan200-2280-2s64p-256g--a41 +@@ -19,3 +19,4 @@ mac_addr: + - ac:b3:b5:1e:b7:5d + - ac:b3:b5:1e:b7:5e + model_name: Kunpeng-920 ++ipmi_ip: 9.3.2.6 +diff --git a/hosts/taishan200-2280-2s64p-256g--a42 b/hosts/taishan200-2280-2s64p-256g--a42 +index 1a953df..dce3cf0 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a42 ++++ b/hosts/taishan200-2280-2s64p-256g--a42 +@@ -19,3 +19,4 @@ mac_addr: + - 44:a1:91:35:68:d2 + - 44:a1:91:35:68:d3 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.2.7 +diff --git a/hosts/taishan200-2280-2s64p-256g--a8 b/hosts/taishan200-2280-2s64p-256g--a8 +index fd22672..64f2750 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a8 ++++ b/hosts/taishan200-2280-2s64p-256g--a8 +@@ -13,3 +13,4 @@ mac_addr: + - ac:b3:b5:1e:b6:7d + - ac:b3:b5:1e:b6:7e + model_name: Kunpeng-920 ++ipmi_ip: 9.3.1.8 +diff --git a/hosts/taishan200-2280-2s64p-256g--a9 b/hosts/taishan200-2280-2s64p-256g--a9 +index e360e88..f977a7c 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a9 ++++ b/hosts/taishan200-2280-2s64p-256g--a9 +@@ -15,3 +15,4 @@ mac_addr: + - 44:a1:91:35:1a:72 + - 44:a1:91:35:1a:73 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.1.9 +-- +2.23.0 + diff --git a/hosts/taishan200-2280-2s64p-256g--a9 b/hosts/taishan200-2280-2s64p-256g--a9 index d6c4353..a6aee01 100644 --- a/hosts/taishan200-2280-2s64p-256g--a9 +++ b/hosts/taishan200-2280-2s64p-256g--a9 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 128 -memory: 128G +memory: 256G nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-35000c500bd6a1347 -- 2.23.0

2 2

[PATCH lkp-tests] fix PATH exclude $CCI_SRC/sbin
by Xiao Shenwei 15 Oct '20

15 Oct '20

when run job, the PATH=$PATH:$LKP_SRC/bin exclude $CCI_SRC/sbin, when run multi-docker job, the docker-pull command can't be use Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- daemon/multi-docker | 2 ++ 1 file changed, 2 insertions(+) diff --git a/daemon/multi-docker b/daemon/multi-docker index b47c23e2..bd79595e 100755 --- a/daemon/multi-docker +++ b/daemon/multi-docker @@ -8,6 +8,8 @@ multi_docker() { export CCI_SRC=/c/compass-ci + export PATH="$PATH:$CCI_SRC/sbin" + local hostname=$tbox_group--$HOSTNAME $CCI_SRC/providers/multi-docker -n $hostname -c $nr_container } -- 2.23.0

3 4

[PATCH lkp-tests] fix(tests/*): change mount argument from nfs to cifs
by Wang Yong 15 Oct '20

15 Oct '20

change mount argument from nfs to cifs Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- tests/cci-depends | 2 +- tests/cci-makepkg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cci-depends b/tests/cci-depends index a3c14290..36923ea4 100755 --- a/tests/cci-depends +++ b/tests/cci-depends @@ -28,7 +28,7 @@ pack_arch=$os_arch . $LKP_SRC/distro/$DISTRO -mount $LKP_SERVER:$DEPS_MNT $DEPS_MNT || die "Failed to run mount" +mount -t cifs -o guest,vers=1.0,noacl,nouser_xattr //$LKP_SERVER$DEPS_MNT $DEPS_MNT || die "Failed to run mount" umask 002 diff --git a/tests/cci-makepkg b/tests/cci-makepkg index 2ad53216..9d508262 100755 --- a/tests/cci-makepkg +++ b/tests/cci-makepkg @@ -34,7 +34,7 @@ pack_to=${os_mount}/${os}/${os_arch}/${os_version} cd $LKP_SRC/pkg/$benchmark || die "pkg is empty" [ -n "$LKP_SERVER" ] && { - mount $LKP_SERVER:$PKG_MNT $PKG_MNT || die "Failed to run mount" + mount -t cifs -o guest,vers=1.0,noacl,nouser_xattr //$LKP_SERVER$PKG_MNT $PKG_MNT || die "Failed to run mount" } get_pkg_info() -- 2.23.0

3 4

[PATCH v3 compass-ci 2/2] container/assign-account: answerback-email.rb
by Luan Shengde 15 Oct '20

15 Oct '20

user email_addr,pub_key as parameter for answerback-email tool Usage: ./answerback-email.rb email_addr [pub_key] add pub_key if needed Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/assign-account/answerback-email.rb | 80 ++++++-------------- 1 file changed, 22 insertions(+), 58 deletions(-) diff --git a/container/assign-account/answerback-email.rb b/container/assign-account/answerback-email.rb index b5283ba..7ee4e3c 100755 --- a/container/assign-account/answerback-email.rb +++ b/container/assign-account/answerback-email.rb @@ -34,34 +34,40 @@ the returned data for account_info like: "jumper_ip" => "10.10.10.10", "jumper_port" => "10000" } + +Usage: ruby answerback-email.rb email_addr pub_key + =end require 'json' require 'mail' require 'set' -require_relative '../defconfig.rb' +require_relative '../defconfig' names = Set.new %w[ - JUMPER_IP + JUMPER_HOST JUMPER_PORT CRYSTAL_INTRANET SEND_MAIL_PORT ] +# xx --email xxx --login --ssh-pubkey xxx --raw-email email-file +# samba mount +# ssh logshn (huawei, ) (install pubkey / send password) + defaults = relevant_defaults(names) -JUMPER_IP = defaults['JUMPER_IP'] +JUMPER_HOST = defaults['JUMPER_HOST'] JUMPER_PORT = defaults['JUMPER_PORT'] CRYSTAL_INTRANET = defaults['CRYSTAL_INTRANET'] SEND_MAIL_PORT = defaults['SEND_MAIL_PORT'] -def build_message(email, message_id, infos) +def build_message(email, infos) message = <<~EMAIL_MESSAGE To: #{email} - Message-ID: #{message_id} Subject: jumper account is ready - Dear #{email} + Dear #{email.split('@')[0]} Thank you for joining us. You can use the following command to login the jumper server: @@ -79,67 +85,25 @@ def build_message(email, message_id, infos) return message end -def email_addr(mail_content) - msg = 'not an applying account email' - - raise msg unless mail_content.subject =~ /apply ssh account/i - - email = mail_content.from.join(',') - - return email -end - -# def check_email_available(mail_content, email) -# oos_list = File.read('/c/upstream-repos/repo_list').split(/\n/) -# url = mail_content.body.decoded.split(/\n/).find { |line| line =~ /https?:\/\// } -# base_url = url.split('/')[0,5].join('/') -# message = 'The url is not in upstream repo_list' -# -# raise message unless oos_list.include? base_url -# -# url_fdback = %x(curl #{url}) -# email_index = url_fdback.index email -# -# message = 'No commit info found from the url for the email' -# raise message unless email_index -# end - -def email_message_id(mail_content) - message_id = mail_content.message_id - return message_id -end - -def pub_key_value(mail_content) - pub_key = mail_content.body.decoded.split(/\n/).find { |line| line =~ /ssh-rsa/ } - return pub_key -end - def account_info(pub_key) - account_info_str = %x(curl -XGET '#{JUMPER_IP}:#{JUMPER_PORT}/assign_account' -d "pub_key: #{pub_key}") + account_info_str = if pub_key.nil? + %x(curl -XGET '#{JUMPER_HOST}:#{JUMPER_PORT}/assign_account') + else + %x(curl -XGET '#{JUMPER_HOST}:#{JUMPER_PORT}/assign_account' -d "pub_key: #{pub_key}") + end account_info = JSON.parse account_info_str return account_info end -def send_account(mail_content) - email = email_addr(mail_content) - message_id = email_message_id(mail_content) - # check_email_available(mail_content, email) - - pub_key = pub_key_value(mail_content) +def send_account(email, pub_key) acct_info = account_info(pub_key) - message = build_message(email, message_id, acct_info) + message = build_message(email, acct_info) %x(curl -XPOST '#{CRYSTAL_INTRANET}:#{SEND_MAIL_PORT}/send_mail_text' -d "#{message}") end -def read_mail_content(mail_file) - mail_content = Mail.read(mail_file) - - return mail_content -end - -mail_file = ARGV[0] -mail_content = read_mail_content(mail_file) -send_account(mail_content) +email = ARGV[0] +pub_key = ARGV[1] || nil +send_account(email, pub_key) -- 2.23.0

2 2

[PATCH compass-ci] git_mirror: fix: move Signal.trap to main loop
by Li Yuanchao 15 Oct '20

15 Oct '20

to make it always effective in z9 Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- lib/git_mirror.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/git_mirror.rb b/lib/git_mirror.rb index 4ab5e32..779b488 100644 --- a/lib/git_mirror.rb +++ b/lib/git_mirror.rb @@ -89,7 +89,6 @@ class MirrorMain connection.start channel = connection.create_channel @message_queue = channel.queue('new_refs') - Signal.trap(:SIGCHLD, 'SIG_IGN') end def fork_stat_init(stat_key) @@ -187,6 +186,7 @@ class MirrorMain loop do push_git_queue handle_feedback + Signal.trap(:SIGCHLD, 'SIG_IGN') end end end -- 2.23.0

1 0

[PATCH v3 compass-ci 1/2] container/assign-account: get_account_info.rb fix bugs
by Luan Shengde 15 Oct '20

15 Oct '20

fix bugs: unexpected errors if there is no pub_key /usr/share/ruby/json/common.rb:156:in `parse': 765: unexpected token at 'NoMethodError: undefined method `[]' for nil:NilClass (JSON::ParserError) /usr/local/bin/get_account_info.rb:96:in `setup_jumper_account_info' /usr/local/bin/assign-account.rb:24:in `block in <main>' Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/assign-account/get_account_info.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/container/assign-account/get_account_info.rb b/container/assign-account/get_account_info.rb index 6c211a4..2f93d5b 100755 --- a/container/assign-account/get_account_info.rb +++ b/container/assign-account/get_account_info.rb @@ -33,7 +33,7 @@ setup_jumper_account_info build_account_name read_jumper_info setup_authorized_key - + the returned data for setup_jumper_account_info like: { "account" => "guest", @@ -93,15 +93,15 @@ class AccountStorage def setup_jumper_account_info account_info = read_account_info jumper_info = read_jumper_info - pub_key = @data['pub_key'] + pub_key = @data['pub_key'] unless @data.nil? jumper_ip = jumper_info[0].chomp jumper_port = jumper_info[1].chomp account = account_info[0] - passwd = if pub_key - 'Use pub_key to login' - else + passwd = if pub_key.nil? account_info[1] + else + 'Use pub_key to login' end jumper_account_info = { 'account' => account, -- 2.23.0

2 2

[PATCH compass-ci] rename image name which load from local repository
by Xiao Shenwei 15 Oct '20

15 Oct '20

docker-pull dc-centos:7 the image name is 172.168.xxx.2:5001/dc-centos:7 when you need run a container, should use this image name: 172.168.xxx.2:5001/dc-centos:7 eg: docker run -it 172.168.xxx.2:5001/dc-centos:7 sh for $CCI_SRC/providers/docker/docker.rb: the image_name is based on job.yaml like dc-centos:7, so tag the image to dc-centos:7 Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- sbin/docker-pull | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sbin/docker-pull b/sbin/docker-pull index 61ead7e..5972913 100755 --- a/sbin/docker-pull +++ b/sbin/docker-pull @@ -14,7 +14,9 @@ image_name=$1 local_repository() { echo "pull image from local repository" - docker pull $DOCKER_REGISTRY_HOST:$DOCKER_REGISTRY_PORT/$image_name + docker pull $DOCKER_REGISTRY_HOST:$DOCKER_REGISTRY_PORT/$image_name && { + docker tag $DOCKER_REGISTRY_HOST:$DOCKER_REGISTRY_PORT/$image_name $image_name + } } docker_hub() -- 2.23.0

1 0

[PATCH lkp-tests] lib/job.rb: donot add nil value to pp
by Wei Jihui 15 Oct '20

15 Oct '20

if program_name is nil, then donot add it to pp Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- lib/job.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/job.rb b/lib/job.rb index f91686b5..8a6d68a5 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -574,6 +574,8 @@ class Job end options_hash = @referenced_programs[p_n] program_name = hash_key_re_string(h, p_n, @job['pp'].keys) + next if program_name.nil? + @job["pp"][program_name] = Hash.new() options_array = options_hash.keys options_array.each do |option| -- 2.23.0

2 2

[PATCH compass-ci] job.cr: make modules.cgz independent in initramfs
by Xu Xijian 15 Oct '20

15 Oct '20

Depart modules.cgz from initramfs' cgz to enable optional kernel. Signed-off-by: Xu Xijian <xuxijian(a)huawei.com> --- src/lib/job.cr | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/job.cr b/src/lib/job.cr index 32aa662..64a4301 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -303,6 +303,8 @@ class Job "#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{os_dir}/current")}" temp_initrds << "#{INITRD_HTTP_PREFIX}" + "#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{os_dir}/run-ipconfig.cgz")}" + temp_initrds << "#{INITRD_HTTP_PREFIX}" + + "#{JobHelper.service_path("#{SRV_INITRD}/modules/modules.cgz")}" temp_initrds.concat(initrd_deps.split(/ /)) unless initrd_deps.empty? temp_initrds.concat(initrd_pkg.split(/ /)) unless initrd_pkg.empty? -- 2.23.0

3 3

[PATCH lkp-tests] lib/job.rb: define files find untracked-files at new directory
by Wei Jihui 15 Oct '20

15 Oct '20

git status just find $LKP_SRC/pkg/$program/ this new directory git status -u will find all files under $LKP_SRC/pkg/$program/* 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 f91686b5..0f4cb710 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -586,7 +586,7 @@ class Job # find all create or update files from LKP_SRC directory def find_git_change_files() git_files_list = Array.new() - git_status = %x(cd #{LKP_SRC} && git status --porcelain=1) + git_status = %x(cd #{LKP_SRC} && git status --porcelain=1 -u) git_status_line = git_status.split("\n") git_status_line.each do |line| git_file = line.split[-1] -- 2.23.0

1 0

[PATCH v6 lkp-tests] lib: add forward_port.sh
by Zhang Yale 15 Oct '20

15 Oct '20

Provide a login port for user, determine whether to send the ssh_port message based on the uuid. Signed-off-by: Zhang Yale <zhangyale3(a)huawei.com> --- lib/forward_port.sh | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100755 lib/forward_port.sh diff --git a/lib/forward_port.sh b/lib/forward_port.sh new file mode 100755 index 00000000..fa45953b --- /dev/null +++ b/lib/forward_port.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# uuid +# sshr_port_len +# sshr_port_base + +. $LKP_SRC/lib/http.sh + +sshr_ip=$LKP_SERVER +sshr_port=5050 +[ -n "$sshr_port_len" ] || sshr_port_len=2000 +[ -n "$sshr_port_base" ] || sshr_port_base=50000 + +get_port() +{ + [ -n "$uuid" ] || return + for i in $(seq 1 10) + do + port=$(($(date +%s%N)%"$sshr_port_len"+"$sshr_port_base")) + ssh -o StrictHostKeyChecking=no -o ExitOnForwardFailure=yes -o TCPKeepAlive=yes \ + -Nf -R $port:localhost:22 sshr@"$sshr_ip" -p "$sshr_port" &>/dev/null + [ $? -eq 0 ] || continue + echo "$port" + break + done +} -- 2.23.0

2 4

[PATCH lkp-tests] fix(lkp-bootstrap.servce):$GOCACHE is not defined with jobs that use go-lang
by Zhou Shengrui 15 Oct '20

15 Oct '20

The lkp-bootstrap.service runs before login, and it's environment variables is not completely full.The jobs run with go-lang can't get $GOCACHE and $HOME, will prompt errors like below: build cache is required, but could not be located: GOCACHE is not defined and neither $XDG_CACHE_HOME nor $HOME are defined make: *** [Makefile:34: runc] Error 1 ==> ERROR: A failure occurred in build(). Aborting... Signed-off-by: Zhou Shengrui <zhoushengrui(a)qq.com> --- rootfs/addon/usr/lib/systemd/system/lkp-bootstrap.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootfs/addon/usr/lib/systemd/system/lkp-bootstrap.service b/rootfs/addon/usr/lib/systemd/system/lkp-bootstrap.service index 50320140..92e7e5ee 100644 --- a/rootfs/addon/usr/lib/systemd/system/lkp-bootstrap.service +++ b/rootfs/addon/usr/lib/systemd/system/lkp-bootstrap.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=forking -ExecStart=/etc/init.d/lkp-bootstrap +ExecStart=su -c /etc/init.d/lkp-bootstrap IgnoreSIGPIPE=no KillMode=none TasksMax=infinity -- 2.23.0

3 2

[PATCH lkp-tests] lib/job.rb: revoke change for a9c727816f01a99
by Wei Jihui 15 Oct '20

15 Oct '20

commit id for a9c727816f01a99 is not good, so revoke it Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- lib/job.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/job.rb b/lib/job.rb index 6497f0f1..f91686b5 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -568,9 +568,7 @@ class Job init_program_options() for_each_in(@job, @referenced_programs.keys) do |_pk, h, p_n, p_args| k = hash_key_re_string(@job, p_n, @job['pp'].keys) - next if k.nil? - - unless @job[k].is_a?(Hash) + if k && !(a)job[k].is_a?(Hash) @job['pp'][k] = @job[k] next end -- 2.23.0

1 0

[PATCH compass-ci] fix: sched: tbox -> tbox_group
by Ren Wen 15 Oct '20

15 Oct '20

fix an error. Signed-off-by: Ren Wen <15991987063(a)163.com> --- src/lib/sched.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index 223a30c..a4ddcec 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -418,7 +418,7 @@ class Sched private def find_job(testbox : String, count = 1) tbox_group = JobHelper.match_tbox_group(testbox) - tbox = tbox.partition("--")[0] + tbox = tbox_group.partition("--")[0] boxes = [testbox, tbox_group, tbox] boxes.each do |box| -- 2.23.0

1 1

[PATCH compass-ci] fix: ssh-r: use reserved port range
by Tong Qunfeng 15 Oct '20

15 Oct '20

host reserved an port range (in sysctl.conf) <net.ipv4.ip_local_port_range = 1024 49999> ssh-r mapping the start 2000 port (50000 - 51999) Signed-off-by: Tong Qunfeng <taxcom(a)tom.com> --- container/ssh-r/Dockerfile | 2 +- container/ssh-r/start | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/container/ssh-r/Dockerfile b/container/ssh-r/Dockerfile index 1c10e03..65a13aa 100644 --- a/container/ssh-r/Dockerfile +++ b/container/ssh-r/Dockerfile @@ -21,7 +21,7 @@ RUN chown -R sshr:sshr /home/sshr/.ssh/authorized_keys \ && chmod 600 /home/sshr/.ssh/authorized_keys \ && passwd -u sshr -EXPOSE 20000-22000 +EXPOSE 50000-51999 EXPOSE 22 COPY entry.sh /entry.sh diff --git a/container/ssh-r/start b/container/ssh-r/start index e962656..5c800f3 100755 --- a/container/ssh-r/start +++ b/container/ssh-r/start @@ -15,7 +15,7 @@ cmd=( -e GATEWAY_PORTS=true -e TCP_FORWARDING=true -d - -p 20000-22000:20000-22000 + -p 50000-51999:50000-51999 -p 5050:22 -v /etc/localtime:/etc/localtime:ro -v /srv/pub/sshr/keys/:/etc/ssh/keys -- 2.23.0

1 0

[PATCH lkp-tests 2/3] lib/job.rb: load host config with atomic job
by Wei Jihui 15 Oct '20

15 Oct '20

Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- lib/job.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/job.rb b/lib/job.rb index 8a6d68a5..38df0368 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -696,9 +696,11 @@ class Job each_job_init each_job(&block) @jobs.each do |hash| + @load_hosts_done = false @job = deepcopy(job) @job2 = hash load_defaults + load_hosts_config each_job_init each_job(&block) end -- 2.23.0

2 1

[PATCH lkp-tests] feat(iso2rootfs): add a soft link to the newest version of rootfs dir
by Yu Chuan 15 Oct '20

15 Oct '20

Allow job can use the debug rootfs dir by specifying 'os_version' as '{os_version}-debug'. Signed-off-by: Yu Chuan <13186087857(a)163.com> --- tests/iso2rootfs | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/tests/iso2rootfs b/tests/iso2rootfs index 5184041abf2b..7ab4a08b0d60 100755 --- a/tests/iso2rootfs +++ b/tests/iso2rootfs @@ -72,13 +72,14 @@ get_daily_iso_checksum() mount_rootfs() { + DEBUG_ROOTFS_DIR="debug-versions/dailybuild" case ${rootfs_protocol} in "nfs") - ROOTFS_SERVER_PATH="${rootfs_server}:${rootfs_path}/${iso_os}/${iso_arch}/debug-versions/dailybuild" + ROOTFS_SERVER_PATH="${rootfs_server}:${rootfs_path}/${iso_os}/${iso_arch}" install_pkgs "nfs-utils" ;; "cifs") - ROOTFS_SERVER_PATH="//${rootfs_server}/${rootfs_path}/${iso_os}/${iso_arch}/debug-versions/dailybuild" + ROOTFS_SERVER_PATH="//${rootfs_server}/${rootfs_path}/${iso_os}/${iso_arch}" ROOTFS_MOUNT_PARAM="guest,vers=1.0,noacl,nouser_xattr" install_pkgs "cifs-utils" ;; @@ -102,7 +103,7 @@ get_cache_iso_checksum() { mount_rootfs - CHECKSUM_FILE_CACHE="${ROOTFS_LOCAL_PATH}/${iso_version}-newest.sha256sum" + CHECKSUM_FILE_CACHE="${ROOTFS_LOCAL_PATH}/${DEBUG_ROOTFS_DIR}/${iso_version}-newest.sha256sum" [ ! -f "${CHECKSUM_FILE_CACHE}" ] || SHA256SUM_CACHE=$(awk '{print $1}' "$CHECKSUM_FILE_CACHE") } @@ -254,7 +255,7 @@ download_compass_ci() config_rootfs_dir() { - ROOTFS_DES_DIR=${ROOTFS_LOCAL_PATH}/${iso_version}-$(date "+%Y%m%d%H%M%S") + ROOTFS_DES_DIR=${ROOTFS_LOCAL_PATH}/${DEBUG_ROOTFS_DIR}/${iso_version}-$(date "+%Y%m%d%H%M%S") [ -d "${ROOTFS_DES_DIR}" ] && ROOTFS_DES_DIR="${ROOTFS_DES_DIR}-${HOSTNAME##*--}" mkdir -p "$ROOTFS_DES_DIR" @@ -309,10 +310,10 @@ test_rootfs() local root_path case ${rootfs_protocol} in "nfs") - root_path="${ROOTFS_SERVER_PATH}/$(basename "${ROOTFS_DES_DIR}")" + root_path="${ROOTFS_SERVER_PATH}/${DEBUG_ROOTFS_DIR}/$(basename "${ROOTFS_DES_DIR}")" ;; "cifs") - root_path="cifs:${ROOTFS_SERVER_PATH}/$(basename "${ROOTFS_DES_DIR}"),${ROOTFS_MOUNT_PARAM}" + root_path="cifs:${ROOTFS_SERVER_PATH}/${DEBUG_ROOTFS_DIR}/$(basename "${ROOTFS_DES_DIR}"),${ROOTFS_MOUNT_PARAM}" ;; *) die "rootfs_protocol is none, exit !!!" @@ -362,7 +363,12 @@ post_works() mv "${CHECKSUM_FILE_CACHE}.tmp" "${CHECKSUM_FILE_CACHE}" - umount "${ROOTFS_LOCAL_PATH}" + cd "${ROOTFS_LOCAL_PATH}" && + rm -f "${iso_version}-debug" && + ln -s "${DEBUG_ROOTFS_DIR}/$(basename ${ROOTFS_DES_DIR})" \ + "${iso_version}-debug" + + cd / && umount "${ROOTFS_LOCAL_PATH}" log_info "iso2rootfs finished" } -- 2.23.0

1 0

[PATCH compass-ci] fix: sched: find job from 2 types of tbox_group queues
by Ren Wen 15 Oct '20

15 Oct '20

Job is saved into tbox_group queues when submitting, so find job from tbox_group queues. When hostname is 'taishan200-2280-2s48p-256g--a11-12', first find job from 'taishan200-2280-2s48p-256g--a11', then find from 'taishan200-2280-2s48p-256g--a11-12'. Signed-off-by: Ren Wen <15991987063(a)163.com> --- src/lib/sched.cr | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index 2fbf05d..2fab207 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -417,10 +417,15 @@ class Sched end private def find_job(testbox : String, count = 1) - tbox = JobHelper.match_tbox_group(testbox) - tbox_group = tbox.partition("--")[0] - - boxes = [testbox, tbox, tbox_group] + # For example: + # testbox : taishan200-2280-2s48p-256g--a11-12 + # tbox : taishan200-2280-2s48p-256g--a11 + # tbox_group : taishan200-2280-2s48p-256g + sep = "--" + tbox = testbox.sub(/(-\d+)+$/, "") + tbox_group = tbox.rchop("#{sep}#{tbox.split(sep)[-1]}") + + boxes = [tbox, tbox_group] boxes.each do |box| count.times do job = prepare_job("sched/#{box}", testbox) -- 2.23.0

2 2

[PATCH v2 compass-ci] fix: sched: fix variable name not find
by Ren Wen 15 Oct '20

15 Oct '20

Forget to modify variable name when exchanging 2 variable names. So fix it. Signed-off-by: Ren Wen <15991987063(a)163.com> --- src/lib/sched.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index 223a30c..a4ddcec 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -418,7 +418,7 @@ class Sched private def find_job(testbox : String, count = 1) tbox_group = JobHelper.match_tbox_group(testbox) - tbox = tbox.partition("--")[0] + tbox = tbox_group.partition("--")[0] boxes = [testbox, tbox_group, tbox] boxes.each do |box| -- 2.23.0

1 0

[PATCH v3 compass-ci] fix: sched: find and submit idle job using tbox_group
by Ren Wen 15 Oct '20

15 Oct '20

Using tbox_group to find and submit idle jobs. Example: Here is a hostname: taishan200-2280-2s48p-256g--a11-<sn> Before: using taishan200-2280-2s48p-256g Now: using taishan200-2280-2s48p-256g--a11 Signed-off-by: Ren Wen <15991987063(a)163.com> --- src/lib/sched.cr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index 2fbf05d..223a30c 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -417,10 +417,10 @@ class Sched end private def find_job(testbox : String, count = 1) - tbox = JobHelper.match_tbox_group(testbox) - tbox_group = tbox.partition("--")[0] + tbox_group = JobHelper.match_tbox_group(testbox) + tbox = tbox.partition("--")[0] - boxes = [testbox, tbox, tbox_group] + boxes = [testbox, tbox_group, tbox] boxes.each do |box| count.times do job = prepare_job("sched/#{box}", testbox) -- 2.23.0

1 1

[PATCH v7 compass-ci] sparrow: process will exit if firewalld.service was not installed
by Hu Xuejiao 15 Oct '20

15 Oct '20

When firewalld is inactive, return code of 'systemctl status firewalld' will be 3, and install-tiny has set -e, so this will cause this process exit. Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- sparrow/2-network/iptables | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/sparrow/2-network/iptables b/sparrow/2-network/iptables index 092c4ca..e5955d0 100755 --- a/sparrow/2-network/iptables +++ b/sparrow/2-network/iptables @@ -12,15 +12,16 @@ iptables -I FORWARD 1 -j ACCEPT iptables -t nat -A POSTROUTING -o "$PUB_IFACE" -s $BR0_SUBNET -j MASQUERADE iptables -t nat -A POSTROUTING -o $BR0_IFACE -d $BR0_SUBNET -j MASQUERADE -systemctl status firewalld | grep -q "running" && { +command -v firewall-cmd > /dev/null || { + exit 0 +} - DOCKER0_IFACE=docker0 - DOCKER0_SUBNET=172.17.0.0/16 +[ "$(systemctl is-active firewalld)" == "active" ] || { + exit 0 +} - iptables -t nat -A POSTROUTING -o $PUB_IFACE -s $DOCKER0_SUBNET -j MASQUERADE - iptables -t nat -A POSTROUTING -o $DOCKER0_IFACE -d $DOCKER0_SUBNET -j MASQUERADE +DOCKER0_SUBNET=172.17.0.0/16 - firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=$DOCKER0_SUBNET accept" - firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=$BR0_SUBNET accept" - firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=0.0.0.0/32 accept" -} +firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=$DOCKER0_SUBNET accept" +firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=$BR0_SUBNET accept" +firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=0.0.0.0/32 accept" -- 2.23.0

1 0

[PATCH v2 compass-ci] sched: refactor get_boot_ipxe to job class
by Cao Xueliang 15 Oct '20

15 Oct '20

The function get_boot_ipxe use initrds_path, kernel, kernel_params from job class as response. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- src/lib/job.cr | 120 +++++++++++++++++++++++++++++++++---- src/lib/sched.cr | 65 ++------------------ src/scheduler/constants.cr | 4 ++ 3 files changed, 116 insertions(+), 73 deletions(-) diff --git a/src/lib/job.cr b/src/lib/job.cr index 53a560c..b301c47 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -72,11 +72,15 @@ class Job lab initrd_pkg initrd_deps + initrds + initrds_path result_root access_key access_key_file lkp_initrd_user + kernel kernel_append_root + kernel_params docker_image ) @@ -123,8 +127,12 @@ class Job set_result_root() set_result_service() set_os_mount() - set_kernel_append_root() set_pp_initrd() + set_initrds() + set_initrds_path() + set_kernel() + set_kernel_append_root() + set_kernel_params() set_lkp_server() end @@ -228,27 +236,114 @@ class Job end end - private def set_kernel_append_root - os_real_path = JobHelper.service_path("#{SRV_OS}/#{os_dir}") - lkp_real_path = JobHelper.service_path("#{SRV_OS}/#{os_dir}/initrd.lkp") - lkp_basename = File.basename(lkp_real_path) + private def vmlinuz + if os_mount == "initramfs" + return "#{INITRD_HTTP_PREFIX}" + + "#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{os_dir}/vmlinuz")}" + else + return "#{OS_HTTP_PREFIX}" + + "#{JobHelper.service_path("#{SRV_OS}/#{os_dir}/vmlinuz")}" + end + end + + private def set_kernel + self["kernel"] = "kernel #{vmlinuz()}" + end + + private def kernel_common_params + return "user=lkp job=/lkp/scheduled/job.yaml RESULT_ROOT=/result/job rootovl ip=dhcp ro" + end + + private def common_initrds + temp_initrds = [] of String + temp_initrds << "#{INITRD_HTTP_PREFIX}" + + "#{JobHelper.service_path("#{SRV_INITRD}/lkp/#{lkp_initrd_user}/lkp-#{os_arch}.cgz")}" + temp_initrds << "#{SCHED_HTTP_PREFIX}/job_initrd_tmpfs/#{id}/job.cgz" + + return temp_initrds + end + + private def initramfs_initrds + temp_initrds = [] of String + + temp_initrds << "#{INITRD_HTTP_PREFIX}" + + "#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{os_dir}/current")}" + temp_initrds << "#{INITRD_HTTP_PREFIX}" + + "#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{os_dir}/run-ipconfig.cgz")}" + + temp_initrds.concat(initrd_deps.split(/ /)) unless initrd_deps.empty? + temp_initrds.concat(initrd_pkg.split(/ /)) unless initrd_pkg.empty? + + return temp_initrds + end + + private def nfs_cifs_initrds + temp_initrds = [] of String + temp_initrds << "#{OS_HTTP_PREFIX}" + + "#{JobHelper.service_path("#{SRV_OS}/#{os_dir}/initrd.lkp")}" + + return temp_initrds + end + + private def set_initrds + temp_initrds = [] of String - current_basename = "" if "#{os_mount}" == "initramfs" - current_real_path = JobHelper.service_path("#{SRV_INITRD}/osimage/#{os_dir}/current") - current_basename = File.basename(current_real_path) + temp_initrds.concat(initramfs_initrds()) + else + temp_initrds.concat(nfs_cifs_initrds()) end + temp_initrds.concat(common_initrds()) + + self["initrds"] = temp_initrds.join(" ") + end + + private def initrds_basename + basenames = "" + + initrds.split(/ /).each do |initrd| + basenames += "initrd=#{File.basename(initrd)} " + end + + return basenames + end + + private def set_initrds_path + paths = "" + + initrds.split(/ /).each do |initrd| + paths += "initrd #{initrd}\n" + end + + self["initrds_path"] = paths + end + + private def set_kernel_append_root + os_real_path = JobHelper.service_path("#{SRV_OS}/#{os_dir}") + fs2root = { - "nfs" => "root=#{OS_HTTP_HOST}:#{os_real_path} initrd=#{lkp_basename}", + "nfs" => "root=#{OS_HTTP_HOST}:#{os_real_path} #{initrds_basename()}", "cifs" => "root=cifs://#{OS_HTTP_HOST}#{os_real_path}" + - ",guest,ro,hard,vers=1.0,noacl,nouser_xattr initrd=#{lkp_basename}", - "initramfs" => "rdinit=/sbin/init prompt_ramdisk=0 initrd=#{current_basename}", - "container" => "" + ",guest,ro,hard,vers=1.0,noacl,nouser_xattr #{initrds_basename()}", + "initramfs" => "rdinit=/sbin/init prompt_ramdisk=0 #{initrds_basename()}", + "container" => "", } self["kernel_append_root"] = fs2root[os_mount] end + private def kernel_console + if os_arch == "x86_64" + return "console=ttyS0,115200 console=tty0" + else + return "" + end + end + + private def set_kernel_params + self["kernel_params"] = " #{kernel_common_params()} #{kernel_append_root} #{kernel_console()}" + end + private def set_pp_initrd initrd_deps_arr = Array(String).new initrd_pkg_arr = Array(String).new @@ -270,6 +365,7 @@ class Job end end end + self["initrd_deps"] = initrd_deps_arr.join(" ") self["initrd_pkg"] = initrd_pkg_arr.join(" ") end diff --git a/src/lib/sched.cr b/src/lib/sched.cr index 47a2e54..04c6317 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -480,69 +480,12 @@ class Sched extra_job_fields) if Dir.glob(full_path_patterns).size > 0 end - private def add_kernel_console_param(arch_tmp) - returned = "" - if arch_tmp == "x86_64" - returned = " console=ttyS0,115200 console=tty0" - end - return returned - end - - private def get_pp_initrd(job : Job) - initrd_deps = "" - initrd_pkg = "" - if job.os_mount == "initramfs" - initrd_deps += job.initrd_deps.split.join() { |item| "initrd #{item}\n" } - initrd_pkg += job.initrd_pkg.split.join() { |item| "initrd #{item}\n" } - end - return initrd_deps, initrd_pkg - end - private def get_boot_ipxe(job : Job) - initrd_lkp_cgz = "lkp-#{job.os_arch}.cgz" - - initrd_deps, initrd_pkg = get_pp_initrd(job) - - initrd_http_prefix = "http://#{INITRD_HTTP_HOST}:#{INITRD_HTTP_PORT}" - sched_http_prefix = "http://#{SCHED_HOST}:#{SCHED_PORT}" - os_http_prefix = "http://#{OS_HTTP_HOST}:#{OS_HTTP_PORT}" - response = "#!ipxe\n\n" - if job.os_mount == "initramfs" - response += "initrd #{initrd_http_prefix}" + - "#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{job.os_dir}/current")}\n" - response += "initrd #{initrd_http_prefix}" + - "#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{job.os_dir}/run-ipconfig.cgz")}\n" - else - response += "initrd #{os_http_prefix}" + - "#{JobHelper.service_path("#{SRV_OS}/#{job.os_dir}/initrd.lkp")}\n" - end - response += "initrd #{initrd_http_prefix}" + - "#{JobHelper.service_path("#{SRV_INITRD}/lkp/#{job.lkp_initrd_user}/#{initrd_lkp_cgz}")}\n" - response += "initrd #{sched_http_prefix}/job_initrd_tmpfs/#{job.id}/job.cgz\n" - response += initrd_deps - response += initrd_pkg - if job.os_mount == "initramfs" - response += "kernel #{initrd_http_prefix}" + - "#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{job.os_dir}/vmlinuz")}" - else - response += "kernel #{os_http_prefix}" + - "#{JobHelper.service_path("#{SRV_OS}/#{job.os_dir}/vmlinuz")}" - end - response += " user=lkp" - response += " job=/lkp/scheduled/job.yaml RESULT_ROOT=/result/job rootovl ip=dhcp ro" - response += " #{job.kernel_append_root}" - response += add_kernel_console_param(job.os_arch) - if job.os_mount == "initramfs" - response += " initrd=#{initrd_lkp_cgz} initrd=job.cgz" - job.initrd_deps.split.each do |initrd_dep| - response += " initrd=#{File.basename(initrd_dep)}" - end - response += " initrd=#{File.basename(JobHelper.service_path("#{SRV_INITRD}/osimage/#{job.os_dir}/run-ipconfig.cgz"))}\n" - else - response += " initrd=#{initrd_lkp_cgz} initrd=job.cgz\n" - end - response += "boot\n" + response += job.initrds_path + response += job.kernel + response += job.kernel_params + response += "\nboot\n" puts %({"job_id": "#{job.id}", "job_state": "boot"}) return response diff --git a/src/scheduler/constants.cr b/src/scheduler/constants.cr index 7ce49a1..839c241 100644 --- a/src/scheduler/constants.cr +++ b/src/scheduler/constants.cr @@ -24,4 +24,8 @@ OS_HTTP_PORT = (ENV.has_key?("OS_HTTP_PORT") ? ENV["OS_HTTP_PORT"] : 8000).to_i3 SRV_OS = "/srv/os" SRV_INITRD = "/srv/initrd" +INITRD_HTTP_PREFIX = "http://#{INITRD_HTTP_HOST}:#{INITRD_HTTP_PORT}" +OS_HTTP_PREFIX = "http://#{OS_HTTP_HOST}:#{OS_HTTP_PORT}" +SCHED_HTTP_PREFIX = "http://#{SCHED_HOST}:#{SCHED_PORT}" + DEMO_JOB = %({"suite":"pixz","testcase":"pixz","category":"benchmark","nr_threads":1,"pixz":null,"job_origin":"jobs/pixz.yaml","testbox":"wfg-e595","arch":"x86_64","tbox_group":"wfg-e595","id":"100","kmsg":null,"boot-time":null,"uptime":null,"iostat":null,"heartbeat":null,"vmstat":null,"numa-numastat":null,"numa-vmstat":null,"numa-meminfo":null,"proc-vmstat":null,"proc-stat":null,"meminfo":null,"slabinfo":null,"interrupts":null,"kconfig":"x86_64-rhel-7.6","compiler":"gcc-7"}) -- 2.23.0

2 3

[PATCH v2 compass-ci 2/2] container/assign-account: answerback-email.rb
by Luan Shengde 15 Oct '20

15 Oct '20

user email_addr,pub_key as parameter for answerback-email tool Usage: ./answerback-email.rb email_addr [pub_key] add pub_key if needed Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/assign-account/answerback-email.rb | 78 ++++++-------------- 1 file changed, 21 insertions(+), 57 deletions(-) diff --git a/container/assign-account/answerback-email.rb b/container/assign-account/answerback-email.rb index b5283ba..ad24fcd 100755 --- a/container/assign-account/answerback-email.rb +++ b/container/assign-account/answerback-email.rb @@ -34,31 +34,37 @@ the returned data for account_info like: "jumper_ip" => "10.10.10.10", "jumper_port" => "10000" } + +Usage: ruby answerback-email.rb email_addr pub_key + =end require 'json' require 'mail' require 'set' -require_relative '../defconfig.rb' +require_relative '../defconfig' names = Set.new %w[ - JUMPER_IP + JUMPER_HOST JUMPER_PORT CRYSTAL_INTRANET SEND_MAIL_PORT ] +# xx --email xxx --login --ssh-pubkey xxx --raw-email email-file +# samba mount +# ssh logshn (huawei, ) (install pubkey / send password) + defaults = relevant_defaults(names) -JUMPER_IP = defaults['JUMPER_IP'] +JUMPER_HOST = defaults['JUMPER_HOST'] JUMPER_PORT = defaults['JUMPER_PORT'] CRYSTAL_INTRANET = defaults['CRYSTAL_INTRANET'] SEND_MAIL_PORT = defaults['SEND_MAIL_PORT'] -def build_message(email, message_id, infos) +def build_message(email, infos) message = <<~EMAIL_MESSAGE To: #{email} - Message-ID: #{message_id} Subject: jumper account is ready Dear #{email} @@ -79,67 +85,25 @@ def build_message(email, message_id, infos) return message end -def email_addr(mail_content) - msg = 'not an applying account email' - - raise msg unless mail_content.subject =~ /apply ssh account/i - - email = mail_content.from.join(',') - - return email -end - -# def check_email_available(mail_content, email) -# oos_list = File.read('/c/upstream-repos/repo_list').split(/\n/) -# url = mail_content.body.decoded.split(/\n/).find { |line| line =~ /https?:\/\// } -# base_url = url.split('/')[0,5].join('/') -# message = 'The url is not in upstream repo_list' -# -# raise message unless oos_list.include? base_url -# -# url_fdback = %x(curl #{url}) -# email_index = url_fdback.index email -# -# message = 'No commit info found from the url for the email' -# raise message unless email_index -# end - -def email_message_id(mail_content) - message_id = mail_content.message_id - return message_id -end - -def pub_key_value(mail_content) - pub_key = mail_content.body.decoded.split(/\n/).find { |line| line =~ /ssh-rsa/ } - return pub_key -end - def account_info(pub_key) - account_info_str = %x(curl -XGET '#{JUMPER_IP}:#{JUMPER_PORT}/assign_account' -d "pub_key: #{pub_key}") + account_info_str = if pub_key.nil? + %x(curl -XGET '#{JUMPER_HOST}:#{JUMPER_PORT}/assign_account') + else + %x(curl -XGET '#{JUMPER_HOST}:#{JUMPER_PORT}/assign_account' -d "pub_key: #{pub_key}") + end account_info = JSON.parse account_info_str return account_info end -def send_account(mail_content) - email = email_addr(mail_content) - message_id = email_message_id(mail_content) - # check_email_available(mail_content, email) - - pub_key = pub_key_value(mail_content) +def send_account(email, pub_key) acct_info = account_info(pub_key) - message = build_message(email, message_id, acct_info) + message = build_message(email, acct_info) %x(curl -XPOST '#{CRYSTAL_INTRANET}:#{SEND_MAIL_PORT}/send_mail_text' -d "#{message}") end -def read_mail_content(mail_file) - mail_content = Mail.read(mail_file) - - return mail_content -end - -mail_file = ARGV[0] -mail_content = read_mail_content(mail_file) -send_account(mail_content) +email = ARGV[0] +pub_key = ARGV[1] || nil +send_account(email, pub_key) -- 2.23.0

2 1

[PATCH lkp-tests 1/3] lib/job.rb: check pp key
by Wei Jihui 15 Oct '20

15 Oct '20

next when check key is nil, do not add it to pp Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- lib/job.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/job.rb b/lib/job.rb index 6497f0f1..8a6d68a5 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -568,14 +568,14 @@ class Job init_program_options() for_each_in(@job, @referenced_programs.keys) do |_pk, h, p_n, p_args| k = hash_key_re_string(@job, p_n, @job['pp'].keys) - next if k.nil? - - unless @job[k].is_a?(Hash) + if k && !(a)job[k].is_a?(Hash) @job['pp'][k] = @job[k] next end options_hash = @referenced_programs[p_n] program_name = hash_key_re_string(h, p_n, @job['pp'].keys) + next if program_name.nil? + @job["pp"][program_name] = Hash.new() options_array = options_hash.keys options_array.each do |option| -- 2.23.0

2 1

[PATCH v2 compass-ci 1/2] container/assign-account: get_account_info.rb fix bugs
by Luan Shengde 15 Oct '20

15 Oct '20

fix bugs: unexpected errors if there is no pub_key /usr/share/ruby/json/common.rb:156:in `parse': 765: unexpected token at 'NoMethodError: undefined method `[]' for nil:NilClass (JSON::ParserError) /usr/local/bin/get_account_info.rb:96:in `setup_jumper_account_info' /usr/local/bin/assign-account.rb:24:in `block in <main>' Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/assign-account/get_account_info.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/container/assign-account/get_account_info.rb b/container/assign-account/get_account_info.rb index 6c211a4..2f93d5b 100755 --- a/container/assign-account/get_account_info.rb +++ b/container/assign-account/get_account_info.rb @@ -33,7 +33,7 @@ setup_jumper_account_info build_account_name read_jumper_info setup_authorized_key - + the returned data for setup_jumper_account_info like: { "account" => "guest", @@ -93,15 +93,15 @@ class AccountStorage def setup_jumper_account_info account_info = read_account_info jumper_info = read_jumper_info - pub_key = @data['pub_key'] + pub_key = @data['pub_key'] unless @data.nil? jumper_ip = jumper_info[0].chomp jumper_port = jumper_info[1].chomp account = account_info[0] - passwd = if pub_key - 'Use pub_key to login' - else + passwd = if pub_key.nil? account_info[1] + else + 'Use pub_key to login' end jumper_account_info = { 'account' => account, -- 2.23.0

1 0

[PATCH compass-ci] web-backend: add "/update_repos" api and search feature to "/get_repos"
by Zhang Yuhang 15 Oct '20

15 Oct '20

"/update_repos" will be called by git mirror service. Signed-off-by: Zhang Yuhang <zhangyuhang25(a)huawei.com> --- container/web-backend-nginx/nginx.conf | 5 +- container/web-backend/web-backend | 9 ++ lib/constants.rb | 3 + src/lib/web_backend.rb | 138 ++++++++++++++----------- 4 files changed, 94 insertions(+), 61 deletions(-) diff --git a/container/web-backend-nginx/nginx.conf b/container/web-backend-nginx/nginx.conf index 5ab1a26..b461a2c 100644 --- a/container/web-backend-nginx/nginx.conf +++ b/container/web-backend-nginx/nginx.conf @@ -6,7 +6,7 @@ events { http { include /etc/nginx/mime.types; default_type application/octet-stream; - include /etc/nginx/conf.d/*.conf; + include /etc/nginx/conf.d/*.conf; server { listen 11320 ssl; server_name api.compass-ci.openeuler.org; @@ -15,8 +15,7 @@ http { ssl_session_timeout 5m; ssl_ciphers BCDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4; ssl_prefer_server_ciphers on; - - location / { + location ~ ^/(get_repos|get_jobs|compare|compare_candidates)$ { proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forward-For $proxy_add_x_forwarded_for; diff --git a/container/web-backend/web-backend b/container/web-backend/web-backend index 60c7827..05f7f6a 100755 --- a/container/web-backend/web-backend +++ b/container/web-backend/web-backend @@ -9,6 +9,7 @@ require "#{CCI_SRC}/src/lib/web_backend.rb" set :bind, '0.0.0.0' set :port, 32767 set :show_exceptions, false +set :environment, :production # GET /compare_candidates # return: {"query_conditions": {...}, "dimension": [...]} @@ -62,3 +63,11 @@ end get '/get_repos' do get_repos(params) end + +# POST /update_repos +# Body: repos hash json +# Content-Type: "Application/json" +# Description: update repos by git mirror service +post '/update_repos' do + update_repos(request) +end diff --git a/lib/constants.rb b/lib/constants.rb index 3a4f083..efecaef 100644 --- a/lib/constants.rb +++ b/lib/constants.rb @@ -10,3 +10,6 @@ ES_PORT = config['ES_PORT'] || 9200 MAIL_HOST = config['MAIL_HOST'] || '172.17.0.1' MAIL_PORT = config['MAIL_PORT'] || 11_311 + +# web-backend service port that makes git mirror service updates "repos" of web-backend service +WEB_BACKEND_PORT = 32767 diff --git a/src/lib/web_backend.rb b/src/lib/web_backend.rb index 4544690..da1da25 100644 --- a/src/lib/web_backend.rb +++ b/src/lib/web_backend.rb @@ -12,7 +12,6 @@ require "#{CCI_SRC}/lib/es_query.rb" require "#{CCI_SRC}/lib/matrix2.rb" UPSTREAM_REPOS_PATH = ENV['UPSTREAM_REPOS_PATH'] || '/c/upstream-repos' - FIELDS = %w[ upstream_repo os @@ -33,6 +32,66 @@ PREFIX_SEARCH_FIELDS = ['tbox_group'].freeze ES_CLIENT = Elasticsearch::Client.new(url: "http://#{ES_HOST}:#{ES_PORT}") COMPARE_RECORDS_NUMBER = 50 +# Repos operation class +class Repos + attr_reader :repos, :repos_list + + def initialize + @repos = {} + @repos_list = [] + + Dir["#{UPSTREAM_REPOS_PATH}/*/*/*"].sort.each do |repo_file| + git_repo = repo_file.slice(UPSTREAM_REPOS_PATH.size + 1) + urls = YAML.load_file(repo_file)['url'] if File.file? repo_file + repo = { + git_repo: git_repo, + git_url: get_repo_url(git_repo, urls: urls) + } + @repos_list << repo + end + end + + def get_repo_url(git_repo, urls: nil) + urls ||= @repos[git_repo]['url'] + + return if urls.nil? || urls.empty? + return urls[1] if urls[1] && urls[1][0, 4] == 'http' + + return urls[0] + end + + def find_repos(git_repo, page_num, page_size) + from = page_num * page_size + return [] if wrong_size?(page_size, from) + + repos = [] + if git_repo + @repos_list.each do |repo| + repos << repo if repo[:git_repo].include?(git_repo) + end + end + repos = @repos_list if repos.empty? + repos[from, page_size] + end + + def get_repo(git_repo) + { + git_repo: git_repo, + git_url: get_repo_url(git_repo) + } + end + + def repos=(repos) + repos_list = [] + @repos = repos + @repos.keys.sort.each do |git_repo| + repos_list << get_repo(git_repo) + end + @repos_list = repos_list + end +end + +REPOS = Repos.new def es_query(query) ES_CLIENT.search index: 'jobs*', body: query end @@ -95,7 +154,7 @@ def compare_candidates_body OS: [ { os: 'openeuler', os_version: ['1.0', '20.03'] }, { os: 'centos', os_version: ['7.6', '7.8', '8.1', 'sid'] }, - { os: 'debian', os_version: ['10', 'sid'] }, + { os: 'debian', os_version: %w[10 sid] }, { os: 'archlinux', os_version: ['5.5.0-1'] } ], os_arch: %w[aarch64 x86_64], @@ -270,7 +329,7 @@ end def get_banner(git_repo, branches) { repo: git_repo, - git_url: get_repo(git_repo)[:git_url], + git_url: REPOS.get_repo_url(git_repo), upstream_branch: branches } end @@ -309,79 +368,42 @@ end def get_jobs(params) begin - body = get_jobs_body(params) + body = get_jobs_body(params).to_json rescue StandardError => e warn e.message return [500, headers.merge('Access-Control-Allow-Origin' => '*'), 'get jobs error'] end - [200, headers.merge('Access-Control-Allow-Origin' => '*'), JSON.dump(body)] -end - -def get_repo_url(repo_file) - return unless File.file? repo_file - - urls = YAML.load_file(repo_file)['url'] - urls.each do |url| - return url if url[0, 4] == 'http' - end - urls[0] -end - -def get_repo(git_repo, repo_file = nil) - repo = { - git_repo: git_repo, - git_url: nil - } - return repo if !git_repo && !repo_file - - if !git_repo - git_repo = repo_file[UPSTREAM_REPOS_PATH.size + 1, repo_file.size - 1] - repo[:git_repo] = git_repo - elsif !repo_file - repo_file = File.join(UPSTREAM_REPOS_PATH, git_repo) - end - - repo[:git_url] = get_repo_url(repo_file) - repo -end - -def repo_files_list - Dir["#{UPSTREAM_REPOS_PATH}/*/*/*"].sort -end - -def get_repos_list(repo_files, from, finish, total) - repos_list = [] - - total.times do |index| - next if index < from - break if index >= finish - - repos_list << get_repo(nil, repo_files[index]) - end - repos_list + [200, headers.merge('Access-Control-Allow-Origin' => '*'), body] end def get_repos_body(params) - repo_files = repo_files_list + git_repo = space_to_nil(params[:repo]) page_size = get_positive_number(params[:page_size], 20) page_num = get_positive_number(params[:page_num], 1) - 1 - from = page_num * page_size - finish = from + page_size - total = repo_files.size - { - total: total, - repos: get_repos_list(repo_files, from, finish, total) + total: REPOS.repos_list.size, + repos: REPOS.find_repos(git_repo, page_num, page_size) } end def get_repos(params) begin - body = get_repos_body(params) + body = get_repos_body(params).to_json rescue StandardError => e warn e.message return [500, headers.merge('Access-Control-Allow-Origin' => '*'), 'get repos error'] end - [200, headers.merge('Access-Control-Allow-Origin' => '*'), JSON.dump(body)] + [200, headers.merge('Access-Control-Allow-Origin' => '*'), body] +end + +def update_repos(request) + begin + request.body.rewind # in case someone already read it + REPOS.repos = JSON.parse(request.body.read) + rescue StandardError => e + warn e.message + return [500, headers, 'error'] + end + [200, headers, 'success'] end -- 2.23.0

2 2

[PATCH lkp-tests] test: add test-tools
by Li Ping 15 Oct '20

15 Oct '20

Signed-off-by: Li Ping <15396232681(a)163.com> --- tests/test-tools | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100755 tests/test-tools diff --git a/tests/test-tools b/tests/test-tools new file mode 100755 index 00000000..e0db258a --- /dev/null +++ b/tests/test-tools @@ -0,0 +1,38 @@ +#!/bin/bash +# - testsuite +# - testcase + +cd $BENCHMARK_ROOT/test-tools/mugen || exit +: "${testsuite:=smoke-testing}" +: "${testcase:=oe_test_dd_001}" + +set_env() +{ + bash runoet.sh -c + source ~/.bash_profile +} + +test_one_case() +{ + + bash runoet.sh -f $testsuite -r $testcase -x +} + +test_all_cases() +{ + bash runoet.sh -a +} + +run_test() +{ + set_env + if [ "${testsuite}" == "all" ]&&[ "${testcase}" == "all"] + then + test_all_cases + return + else + test_one_case + fi +} + +run_test -- 2.23.0

2 1

[PATCH v6 lkp-tests] sshd: send emails to login services for users
by Zhang Yale 15 Oct '20

15 Oct '20

Signed-off-by: Zhang Yale <zhangyale3(a)huawei.com> --- daemon/sshd | 63 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 20 deletions(-) diff --git a/daemon/sshd b/daemon/sshd index 98f31d77..6d958dc6 100755 --- a/daemon/sshd +++ b/daemon/sshd @@ -1,6 +1,10 @@ #!/bin/sh # pub_key # email +# uuid + +. $LKP_SRC/lib/transfer_port.sh +. $LKP_SRC/lib/http.sh run_ssh() { @@ -11,40 +15,59 @@ run_ssh() systemctl start sshd } -compose_email() +data_success() { - deadline=$(date -d "+$runtime seconds" +"%Y-%m-%d %H:%M:%S") data="To: $email -Subject: [NOTIFY compass-ci] $testbox ready to ssh +Subject: [NOTIFY Compass-ci] $testbox ready to use -Dear $email: - Thanks for your participation in Kunpeng and software ecosystem! - According to your application, $testbox has been provisioned. - The datails are as follows: +Dear $user_name: + Thanks for your participation in software ecosystem! + According to your application, $testbox has been provisioned. + The datails are as follows: - Login: - ssh root@$PUB_IP - Due time: - $deadline + login: + ssh root(a)api.compass-ci.openeuler.org -p $port + Due time: + $deadline - HW: - nr_cpu: $nr_cpu - memory: $memory - testbox: $testbox - OS: - $os $os_version $os_arch +Regards +Compass-ci +" +} + +data_failure() +{ + data="To: $email +Subject: [NOTIFY Compass-ci] Applying $testbox failed + +Dear $user_name: + Sorry to inform you that your application failed. + You may need to wait for a while and then try again. Regards -compass-ci +Compass-ci " } +compose_email() +{ + deadline=$(date -d "+$runtime seconds" +"%Y-%m-%d %H:%M:%S") + if [ -n "$port" ]; then + data_success + else + data_failure + fi +} + run_email() { - [ -n "$email" ] || return 0 + [ -n "$email" ] && [ -n "$uuid" ] || return 0 + user_name=$(echo "$email" | awk -F '@' '{print $1}') compose_email - curl -XPOST "$MAIL_HOST:$MAIL_PORT/send_mail_text" -d "$data" + curl -XPOST "${MAIL_HOST:-$LKP_SERVER}:${MAIL_PORT:-11312}/send_mail_text" -d "$data" } run_ssh +port=$(get_port) +report_ssh_port $port run_email -- 2.23.0

1 0

[PATCH lab-z9] feat(hosts): add rootfs_partition field
by Yu Chuan 15 Oct '20

15 Oct '20

Signed-off-by: Yu Chuan <13186087857(a)163.com> --- hosts/taishan200-2280-2s48p-256g--a13 | 3 ++- hosts/taishan200-2280-2s48p-256g--a14 | 3 ++- hosts/taishan200-2280-2s48p-256g--a15 | 3 ++- hosts/taishan200-2280-2s48p-256g--a17 | 3 ++- hosts/taishan200-2280-2s48p-256g--a18 | 3 ++- hosts/taishan200-2280-2s48p-256g--a19 | 3 ++- hosts/taishan200-2280-2s48p-256g--a21 | 3 ++- hosts/taishan200-2280-2s48p-256g--a22 | 3 ++- hosts/taishan200-2280-2s48p-256g--a24 | 3 ++- hosts/taishan200-2280-2s48p-256g--a25 | 3 ++- hosts/taishan200-2280-2s48p-256g--a26 | 3 ++- hosts/taishan200-2280-2s48p-256g--a27 | 3 ++- hosts/taishan200-2280-2s48p-256g--a28 | 3 ++- hosts/taishan200-2280-2s48p-256g--a29 | 3 ++- hosts/taishan200-2280-2s48p-256g--a30 | 3 ++- hosts/taishan200-2280-2s48p-256g--a31 | 3 ++- hosts/taishan200-2280-2s48p-256g--a32 | 3 ++- hosts/taishan200-2280-2s48p-256g--a33 | 3 ++- hosts/taishan200-2280-2s48p-256g--a34 | 3 ++- hosts/taishan200-2280-2s48p-256g--a52 | 3 ++- hosts/taishan200-2280-2s48p-256g--a53 | 3 ++- hosts/taishan200-2280-2s48p-256g--a60 | 3 ++- hosts/taishan200-2280-2s48p-256g--a61 | 3 ++- hosts/taishan200-2280-2s48p-256g--a62 | 3 ++- hosts/taishan200-2280-2s48p-256g--a66 | 3 ++- hosts/taishan200-2280-2s48p-256g--a67 | 3 ++- hosts/taishan200-2280-2s48p-256g--a68 | 3 ++- hosts/taishan200-2280-2s48p-256g--a69 | 3 ++- hosts/taishan200-2280-2s48p-256g--a70 | 3 ++- hosts/taishan200-2280-2s64p-256g--a10 | 3 +-- hosts/taishan200-2280-2s64p-256g--a36 | 3 +-- hosts/taishan200-2280-2s64p-256g--a40 | 3 ++- hosts/taishan200-2280-2s64p-256g--a41 | 3 ++- hosts/taishan200-2280-2s64p-256g--a42 | 3 ++- hosts/taishan200-2280-2s64p-256g--a9 | 3 ++- 35 files changed, 68 insertions(+), 37 deletions(-) diff --git a/hosts/taishan200-2280-2s48p-256g--a13 b/hosts/taishan200-2280-2s48p-256g--a13 index fe0523377ec9..00b56003e154 100644 --- a/hosts/taishan200-2280-2s48p-256g--a13 +++ b/hosts/taishan200-2280-2s48p-256g--a13 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000c500c2799bb3 - /dev/disk/by-id/scsi-35000c500c278b18b - /dev/disk/by-id/scsi-35000c500c279f96b +rootfs_partition: - /dev/disk/by-id/scsi-35000c500c2789b4b mac_addr: - 44:67:47:97:2b:bf diff --git a/hosts/taishan200-2280-2s48p-256g--a14 b/hosts/taishan200-2280-2s48p-256g--a14 index bd5962b419db..a4732064ce0d 100644 --- a/hosts/taishan200-2280-2s48p-256g--a14 +++ b/hosts/taishan200-2280-2s48p-256g--a14 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88b4475 - /dev/disk/by-id/scsi-350000399b88b4371 - /dev/disk/by-id/scsi-350000399b88b432d +rootfs_partition: - /dev/disk/by-id/scsi-350000399b88b4531 mac_addr: - 44:67:47:c9:e9:c2 diff --git a/hosts/taishan200-2280-2s48p-256g--a15 b/hosts/taishan200-2280-2s48p-256g--a15 index 9b0cd96c1610..2497dd9262dc 100644 --- a/hosts/taishan200-2280-2s48p-256g--a15 +++ b/hosts/taishan200-2280-2s48p-256g--a15 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b841fff5 - /dev/disk/by-id/scsi-350000399b841fcb9 - /dev/disk/by-id/scsi-350000399b8420a0d +rootfs_partition: - /dev/disk/by-id/scsi-350000399b841ff55 mac_addr: - 44:67:47:85:d4:9e diff --git a/hosts/taishan200-2280-2s48p-256g--a17 b/hosts/taishan200-2280-2s48p-256g--a17 index cbbf26867554..9665823ce1ed 100644 --- a/hosts/taishan200-2280-2s48p-256g--a17 +++ b/hosts/taishan200-2280-2s48p-256g--a17 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88b44cd - /dev/disk/by-id/scsi-350000399b88b4541 - /dev/disk/by-id/scsi-350000399b88b4495 +rootfs_partition: - /dev/disk/by-id/scsi-350000399b88b48d1 mac_addr: - 44:67:47:c9:ea:1c diff --git a/hosts/taishan200-2280-2s48p-256g--a18 b/hosts/taishan200-2280-2s48p-256g--a18 index 648a1db254ce..b45980db8801 100644 --- a/hosts/taishan200-2280-2s48p-256g--a18 +++ b/hosts/taishan200-2280-2s48p-256g--a18 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b891b4d1 - /dev/disk/by-id/scsi-350000399b8890d59 - /dev/disk/by-id/scsi-350000399b8890f65 +rootfs_partition: - /dev/disk/by-id/scsi-350000399b891b3c5 mac_addr: - 84:46:fe:3d:a7:e9 diff --git a/hosts/taishan200-2280-2s48p-256g--a19 b/hosts/taishan200-2280-2s48p-256g--a19 index 2aec47778fb7..dc79e40b9ed4 100644 --- a/hosts/taishan200-2280-2s48p-256g--a19 +++ b/hosts/taishan200-2280-2s48p-256g--a19 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8923939 - /dev/disk/by-id/scsi-350000399b8420b2d - /dev/disk/by-id/scsi-350000399b891b5c5 +rootfs_partition: - /dev/disk/by-id/scsi-350000399b841f769 mac_addr: - 44:67:47:85:d5:48 diff --git a/hosts/taishan200-2280-2s48p-256g--a21 b/hosts/taishan200-2280-2s48p-256g--a21 index 9cbb5b5de1cb..e35758128d00 100644 --- a/hosts/taishan200-2280-2s48p-256g--a21 +++ b/hosts/taishan200-2280-2s48p-256g--a21 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88bf2d5 - /dev/disk/by-id/scsi-350000399b88bf5a5 - /dev/disk/by-id/scsi-350000399b88bf279 +rootfs_partition: - /dev/disk/by-id/scsi-350000399b88bf24d mac_addr: - 44:67:47:86:1b:e0 diff --git a/hosts/taishan200-2280-2s48p-256g--a22 b/hosts/taishan200-2280-2s48p-256g--a22 index 6af83a723e14..f11922d9ec16 100644 --- a/hosts/taishan200-2280-2s48p-256g--a22 +++ b/hosts/taishan200-2280-2s48p-256g--a22 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8919069 - /dev/disk/by-id/scsi-350000399b8918c15 - /dev/disk/by-id/scsi-350000399b8918c79 +rootfs_partition: - /dev/disk/by-id/scsi-350000399b8918cb9 mac_addr: - 44:67:47:d7:6d:14 diff --git a/hosts/taishan200-2280-2s48p-256g--a24 b/hosts/taishan200-2280-2s48p-256g--a24 index dd9b501c0f8b..4948112429bc 100644 --- a/hosts/taishan200-2280-2s48p-256g--a24 +++ b/hosts/taishan200-2280-2s48p-256g--a24 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8917d59 - /dev/disk/by-id/scsi-350000399b89185d9 - /dev/disk/by-id/scsi-350000399b891790d +rootfs_partition: - /dev/disk/by-id/scsi-350000399b8917ef1 mac_addr: - 44:67:47:c9:d8:f4 diff --git a/hosts/taishan200-2280-2s48p-256g--a25 b/hosts/taishan200-2280-2s48p-256g--a25 index 5d075b98828d..ee5eeb38673c 100644 --- a/hosts/taishan200-2280-2s48p-256g--a25 +++ b/hosts/taishan200-2280-2s48p-256g--a25 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88b4499 - /dev/disk/by-id/scsi-350000399b88b4455 - /dev/disk/by-id/scsi-350000399b88b442d +rootfs_partition: - /dev/disk/by-id/scsi-350000399b88b44f9 mac_addr: - 44:67:47:c9:ea:08 diff --git a/hosts/taishan200-2280-2s48p-256g--a26 b/hosts/taishan200-2280-2s48p-256g--a26 index fe395ec6157a..0c65a119fe0f 100644 --- a/hosts/taishan200-2280-2s48p-256g--a26 +++ b/hosts/taishan200-2280-2s48p-256g--a26 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88bf131 - /dev/disk/by-id/scsi-350000399b88bfd8d - /dev/disk/by-id/scsi-350000399b88bfe55 +rootfs_partition: - /dev/disk/by-id/scsi-350000399b88bef31 mac_addr: - 44:67:47:c9:e9:40 diff --git a/hosts/taishan200-2280-2s48p-256g--a27 b/hosts/taishan200-2280-2s48p-256g--a27 index 63b94f33bdcb..496b967445a1 100644 --- a/hosts/taishan200-2280-2s48p-256g--a27 +++ b/hosts/taishan200-2280-2s48p-256g--a27 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8918ea9 - /dev/disk/by-id/scsi-350000399b8918bad - /dev/disk/by-id/scsi-350000399b8918d05 +rootfs_partition: - /dev/disk/by-id/scsi-350000399b8919415 mac_addr: - 44:67:47:d7:6d:3c diff --git a/hosts/taishan200-2280-2s48p-256g--a28 b/hosts/taishan200-2280-2s48p-256g--a28 index df048f762092..e20d313676dd 100644 --- a/hosts/taishan200-2280-2s48p-256g--a28 +++ b/hosts/taishan200-2280-2s48p-256g--a28 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000c500cdf1eb07 - /dev/disk/by-id/scsi-35000c500cdef4c6f - /dev/disk/by-id/scsi-35000c500cdefac2b +rootfs_partition: - /dev/disk/by-id/scsi-35000c500cdefa75f mac_addr: - 5c:e8:83:31:c8:20 diff --git a/hosts/taishan200-2280-2s48p-256g--a29 b/hosts/taishan200-2280-2s48p-256g--a29 index 849be55c7ccc..46f9d3a48037 100644 --- a/hosts/taishan200-2280-2s48p-256g--a29 +++ b/hosts/taishan200-2280-2s48p-256g--a29 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8918425 - /dev/disk/by-id/scsi-350000399b891841d - /dev/disk/by-id/scsi-350000399b8917859 +rootfs_partition: - /dev/disk/by-id/scsi-350000399b8917a51 mac_addr: - 44:67:47:c9:d8:ea diff --git a/hosts/taishan200-2280-2s48p-256g--a30 b/hosts/taishan200-2280-2s48p-256g--a30 index 2be9047fbee9..3920c0548172 100644 --- a/hosts/taishan200-2280-2s48p-256g--a30 +++ b/hosts/taishan200-2280-2s48p-256g--a30 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b883b881 - /dev/disk/by-id/scsi-350000399b88bf83d - /dev/disk/by-id/scsi-350000399b883bbbd +rootfs_partition: - /dev/disk/by-id/scsi-350000399b88bf48d mac_addr: - 44:67:47:86:1b:cc diff --git a/hosts/taishan200-2280-2s48p-256g--a31 b/hosts/taishan200-2280-2s48p-256g--a31 index 8af7d18578a6..552391bdd83a 100644 --- a/hosts/taishan200-2280-2s48p-256g--a31 +++ b/hosts/taishan200-2280-2s48p-256g--a31 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b883b929 - /dev/disk/by-id/scsi-350000399b883bbe1 - /dev/disk/by-id/scsi-350000399b883c059 +rootfs_partition: - /dev/disk/by-id/scsi-350000399b883bc9d mac_addr: - 44:67:47:86:1b:ae diff --git a/hosts/taishan200-2280-2s48p-256g--a32 b/hosts/taishan200-2280-2s48p-256g--a32 index fb52e7ff6e0e..a59e1ac288e4 100644 --- a/hosts/taishan200-2280-2s48p-256g--a32 +++ b/hosts/taishan200-2280-2s48p-256g--a32 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88bf141 - /dev/disk/by-id/scsi-350000399b88bee25 - /dev/disk/by-id/scsi-350000399b88bea59 +rootfs_partition: - /dev/disk/by-id/scsi-350000399b88be1d9 mac_addr: - 44:67:47:c9:db:38 diff --git a/hosts/taishan200-2280-2s48p-256g--a33 b/hosts/taishan200-2280-2s48p-256g--a33 index 4095419d77ad..b4305c9bd2c0 100644 --- a/hosts/taishan200-2280-2s48p-256g--a33 +++ b/hosts/taishan200-2280-2s48p-256g--a33 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8919555 - /dev/disk/by-id/scsi-350000399b8918c4d - /dev/disk/by-id/scsi-350000399b8919c3d +rootfs_partition: - /dev/disk/by-id/scsi-350000399b8919389 mac_addr: - 44:67:47:d7:6c:c4 diff --git a/hosts/taishan200-2280-2s48p-256g--a34 b/hosts/taishan200-2280-2s48p-256g--a34 index bae3e5862677..907e3de8b176 100644 --- a/hosts/taishan200-2280-2s48p-256g--a34 +++ b/hosts/taishan200-2280-2s48p-256g--a34 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88be219 - /dev/disk/by-id/scsi-350000399b88bdf71 - /dev/disk/by-id/scsi-350000399b88bdb49 +rootfs_partition: - /dev/disk/by-id/scsi-350000399b891784d mac_addr: - 44:67:47:c9:d9:26 diff --git a/hosts/taishan200-2280-2s48p-256g--a52 b/hosts/taishan200-2280-2s48p-256g--a52 index 654b02129eec..7e2c978dfda5 100644 --- a/hosts/taishan200-2280-2s48p-256g--a52 +++ b/hosts/taishan200-2280-2s48p-256g--a52 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000c500cdefd89b - /dev/disk/by-id/scsi-35000c500cdefac67 - /dev/disk/by-id/scsi-35000c500cdedee6f +rootfs_partition: - /dev/disk/by-id/scsi-35000c500cdedfdaf mac_addr: - 5c:e8:83:31:c8:d4 diff --git a/hosts/taishan200-2280-2s48p-256g--a53 b/hosts/taishan200-2280-2s48p-256g--a53 index a90b8eb8c79e..7a2df7ca7f4e 100644 --- a/hosts/taishan200-2280-2s48p-256g--a53 +++ b/hosts/taishan200-2280-2s48p-256g--a53 @@ -1,9 +1,10 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 2 +nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-35000c500bd6aa4e3 +rootfs_partition: - /dev/disk/by-id/scsi-35000c500bd681acf mac_addr: - 5c:e8:83:73:25:c9 diff --git a/hosts/taishan200-2280-2s48p-256g--a60 b/hosts/taishan200-2280-2s48p-256g--a60 index b87d962fe119..3a89486a34f9 100644 --- a/hosts/taishan200-2280-2s48p-256g--a60 +++ b/hosts/taishan200-2280-2s48p-256g--a60 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000c500bd67640b - /dev/disk/by-id/scsi-35000c500bd6707a7 - /dev/disk/by-id/scsi-35000c500bd680dc3 +rootfs_partition: - /dev/disk/by-id/scsi-35000c500bd683a73 mac_addr: - e0:00:84:2b:51:7d diff --git a/hosts/taishan200-2280-2s48p-256g--a61 b/hosts/taishan200-2280-2s48p-256g--a61 index b33712cd182f..7a95471dea73 100644 --- a/hosts/taishan200-2280-2s48p-256g--a61 +++ b/hosts/taishan200-2280-2s48p-256g--a61 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399886a7869 - /dev/disk/by-id/scsi-350000399886acc5d - /dev/disk/by-id/scsi-350000399886b6861 +rootfs_partition: - /dev/disk/by-id/scsi-350000399886ac70d mac_addr: - 44:67:47:c9:e4:b8 diff --git a/hosts/taishan200-2280-2s48p-256g--a62 b/hosts/taishan200-2280-2s48p-256g--a62 index 5c3b04d05fb8..6451dc414bfd 100644 --- a/hosts/taishan200-2280-2s48p-256g--a62 +++ b/hosts/taishan200-2280-2s48p-256g--a62 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b892d131 - /dev/disk/by-id/scsi-350000399b892d619 - /dev/disk/by-id/scsi-350000399b892dc1d +rootfs_partition: - /dev/disk/by-id/scsi-350000399b892dbb5 mac_addr: - 44:67:47:c9:e3:3a diff --git a/hosts/taishan200-2280-2s48p-256g--a66 b/hosts/taishan200-2280-2s48p-256g--a66 index 88ef791fa2b6..881f2d6d90b3 100644 --- a/hosts/taishan200-2280-2s48p-256g--a66 +++ b/hosts/taishan200-2280-2s48p-256g--a66 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000c5009a671773 - /dev/disk/by-id/scsi-35000c5009a690c53 - /dev/disk/by-id/scsi-35000c5009a6713fb +rootfs_partition: - /dev/disk/by-id/scsi-35000c5009a65963f mac_addr: - 5c:e8:83:31:c8:8e diff --git a/hosts/taishan200-2280-2s48p-256g--a67 b/hosts/taishan200-2280-2s48p-256g--a67 index 97ea4982dde4..d23d755837e8 100644 --- a/hosts/taishan200-2280-2s48p-256g--a67 +++ b/hosts/taishan200-2280-2s48p-256g--a67 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88aed21 - /dev/disk/by-id/scsi-350000399b88af325 - /dev/disk/by-id/scsi-350000399b88af699 +rootfs_partition: - /dev/disk/by-id/scsi-350000399b88af421 mac_addr: - 44:67:47:c9:e2:2c diff --git a/hosts/taishan200-2280-2s48p-256g--a68 b/hosts/taishan200-2280-2s48p-256g--a68 index f3d50f4915b1..0ceb191cda60 100644 --- a/hosts/taishan200-2280-2s48p-256g--a68 +++ b/hosts/taishan200-2280-2s48p-256g--a68 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8909f81 - /dev/disk/by-id/scsi-350000399b8909f79 - /dev/disk/by-id/scsi-350000399b8909605 +rootfs_partition: - /dev/disk/by-id/scsi-350000399b8909b85 mac_addr: - 84:46:fe:89:b6:e6 diff --git a/hosts/taishan200-2280-2s48p-256g--a69 b/hosts/taishan200-2280-2s48p-256g--a69 index 9e5734ee10be..5e948eeb9635 100644 --- a/hosts/taishan200-2280-2s48p-256g--a69 +++ b/hosts/taishan200-2280-2s48p-256g--a69 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88be92d - /dev/disk/by-id/scsi-350000399b88befc5 - /dev/disk/by-id/scsi-350000399b88be701 +rootfs_partition: - /dev/disk/by-id/scsi-350000399b88bea5d mac_addr: - 44:67:47:c9:d9:4e diff --git a/hosts/taishan200-2280-2s48p-256g--a70 b/hosts/taishan200-2280-2s48p-256g--a70 index 0dd82086bb79..760ce0c59183 100644 --- a/hosts/taishan200-2280-2s48p-256g--a70 +++ b/hosts/taishan200-2280-2s48p-256g--a70 @@ -1,11 +1,12 @@ nr_node: 4 nr_cpu: 96 memory: 256G -nr_hdd_partitions: 4 +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b890931d - /dev/disk/by-id/scsi-350000399b8909d79 - /dev/disk/by-id/scsi-350000399b8909ac5 +rootfs_partition: - /dev/disk/by-id/scsi-350000399b8909c99 mac_addr: - 84:46:fe:89:b7:22 diff --git a/hosts/taishan200-2280-2s64p-256g--a10 b/hosts/taishan200-2280-2s64p-256g--a10 index 4687d1a6651b..6e8aec7fdf68 100644 --- a/hosts/taishan200-2280-2s64p-256g--a10 +++ b/hosts/taishan200-2280-2s64p-256g--a10 @@ -1,9 +1,8 @@ nr_node: 4 nr_cpu: 128 memory: 256G -nr_hdd_partitions: 1 nr_ssd_partitions: 1 -hdd_partitions: +rootfs_partition: - /dev/disk/by-id/scsi-350000399c8030fd5 ssd_partitions: - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB44333 diff --git a/hosts/taishan200-2280-2s64p-256g--a36 b/hosts/taishan200-2280-2s64p-256g--a36 index b98e7e75e0a9..1fb15d485a80 100644 --- a/hosts/taishan200-2280-2s64p-256g--a36 +++ b/hosts/taishan200-2280-2s64p-256g--a36 @@ -1,9 +1,8 @@ nr_node: 4 nr_cpu: 128 memory: 256G -nr_hdd_partitions: 1 nr_ssd_partitions: 1 -hdd_partitions: +rootfs_partition: - /dev/disk/by-id/scsi-3500003999813487d ssd_partitions: - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB42949-part1 diff --git a/hosts/taishan200-2280-2s64p-256g--a40 b/hosts/taishan200-2280-2s64p-256g--a40 index c0ce55003567..6040f4fbc8c5 100644 --- a/hosts/taishan200-2280-2s64p-256g--a40 +++ b/hosts/taishan200-2280-2s64p-256g--a40 @@ -1,9 +1,10 @@ nr_node: 4 nr_cpu: 128 memory: 256G -nr_hdd_partitions: 2 +nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-3500003999812ed81 +rootfs_partition: - /dev/disk/by-id/scsi-350000399c8020115 mac_addr: - 84:46:fe:89:be:8e diff --git a/hosts/taishan200-2280-2s64p-256g--a41 b/hosts/taishan200-2280-2s64p-256g--a41 index 9e01396fb27b..fadeadd9517a 100644 --- a/hosts/taishan200-2280-2s64p-256g--a41 +++ b/hosts/taishan200-2280-2s64p-256g--a41 @@ -1,9 +1,10 @@ nr_node: 4 nr_cpu: 128 memory: 256G -nr_hdd_partitions: 2 +nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8919495 +rootfs_partition: - /dev/disk/by-id/scsi-35000039998130a85 mac_addr: - 84:46:fe:89:bc:4a diff --git a/hosts/taishan200-2280-2s64p-256g--a42 b/hosts/taishan200-2280-2s64p-256g--a42 index 1a953dffd52b..81ec47508c54 100644 --- a/hosts/taishan200-2280-2s64p-256g--a42 +++ b/hosts/taishan200-2280-2s64p-256g--a42 @@ -1,9 +1,10 @@ nr_node: 4 nr_cpu: 128 memory: 256G -nr_hdd_partitions: 2 +nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8918a11 +rootfs_partition: - /dev/disk/by-id/scsi-350000399c802ee75 mac_addr: - cc:05:77:fe:d8:64 diff --git a/hosts/taishan200-2280-2s64p-256g--a9 b/hosts/taishan200-2280-2s64p-256g--a9 index 19f4d75b7101..d6c435317f3a 100644 --- a/hosts/taishan200-2280-2s64p-256g--a9 +++ b/hosts/taishan200-2280-2s64p-256g--a9 @@ -1,9 +1,10 @@ nr_node: 4 nr_cpu: 128 memory: 128G -nr_hdd_partitions: 2 +nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-35000c500bd6a1347 +rootfs_partition: - /dev/disk/by-id/scsi-35000c500bd62acb3 mac_addr: - cc:05:77:fe:d4:0e -- 2.23.0

1 0

[PATCH lkp-tests 3/3] lib/job.rb: define files find untracked-files at new directory
by Wei Jihui 14 Oct '20

14 Oct '20

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 38df0368..6359254e 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -588,7 +588,7 @@ class Job # find all create or update files from LKP_SRC directory def find_git_change_files() git_files_list = Array.new() - git_status = %x(cd #{LKP_SRC} && git status --porcelain=1) + git_status = %x(cd #{LKP_SRC} && git status --porcelain=1 -u) git_status_line = git_status.split("\n") git_status_line.each do |line| git_file = line.split[-1] -- 2.23.0

1 0

[PATCH v4 lkp-tests] sshd: send emails to login services for users
by Zhang Yale 14 Oct '20

14 Oct '20

Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- daemon/sshd | 63 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 20 deletions(-) diff --git a/daemon/sshd b/daemon/sshd index 98f31d77..4a94ad45 100755 --- a/daemon/sshd +++ b/daemon/sshd @@ -1,6 +1,10 @@ #!/bin/sh # pub_key # email +# uuid + +. $LKP_SRC/lib/transfer_port.sh +. $LKP_SRC/lib/http.sh run_ssh() { @@ -11,40 +15,59 @@ run_ssh() systemctl start sshd } -compose_email() +data_success() { - deadline=$(date -d "+$runtime seconds" +"%Y-%m-%d %H:%M:%S") data="To: $email -Subject: [NOTIFY compass-ci] $testbox ready to ssh +Subject: [NOTIFY Compass-ci] $testbox ready to use + +Dear $user_name: + Thanks for your participation in software ecosystem! + According to your application, $testbox has been provisioned. + The datails are as follows: + + login: + ssh root(a)api.compass-ci.openeuler.org -p $port + Due time: + $deadline -Dear $email: - Thanks for your participation in Kunpeng and software ecosystem! - According to your application, $testbox has been provisioned. - The datails are as follows: +Regards +Compass-ci +" +} - Login: - ssh root@$PUB_IP - Due time: - $deadline +data_failure() +{ + data="To: $email +Subject: [NOTIFY Compass-ci] Applying $testbox failed - HW: - nr_cpu: $nr_cpu - memory: $memory - testbox: $testbox - OS: - $os $os_version $os_arch +Dear $user_name: + Sorry to inform you that your application failed. + You may need to wait for a while and then thy again. Regards -compass-ci +Compass-ci " } +compose_email() +{ + deadline=$(date -d "+$runtime seconds" +"%Y-%m-%d %H:%M:%S") + if [ -n "$port" ]; then + data_success + else + data_failure + fi +} + run_email() { - [ -n "$email" ] || return 0 + [ -n "$email" ] && [ -n "$uuid" ] || return 0 + user_name=$(echo "$email" | awk -F '@' '{print $1}') compose_email - curl -XPOST "$MAIL_HOST:$MAIL_PORT/send_mail_text" -d "$data" + curl -XPOST "${MAIL_HOST:-$LKP_SERVER}:${MAIL_PORT:-11312}/send_mail_text" -d "$data" } run_ssh +port=$(get_port) +report_ssh_port $port run_email -- 2.23.0

3 6

[PATCH compass-ci 2/2] container/assign-account: answerback-email.rb
by Luan Shengde 14 Oct '20

14 Oct '20

user email_addr,pub_key as parameter for answerback-email tool Usage: ./answerback-email.rb email_addr [pub_key] add pub_key if needed Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/assign-account/answerback-email.rb | 78 ++++++-------------- 1 file changed, 21 insertions(+), 57 deletions(-) diff --git a/container/assign-account/answerback-email.rb b/container/assign-account/answerback-email.rb index b5283ba..da44972 100755 --- a/container/assign-account/answerback-email.rb +++ b/container/assign-account/answerback-email.rb @@ -34,31 +34,37 @@ the returned data for account_info like: "jumper_ip" => "10.10.10.10", "jumper_port" => "10000" } + +Usage: ruby answerback-email.rb email_addr pub_key + =end require 'json' require 'mail' require 'set' -require_relative '../defconfig.rb' +require_relative '../defconfig' names = Set.new %w[ - JUMPER_IP + JUMPER_HOST JUMPER_PORT CRYSTAL_INTRANET SEND_MAIL_PORT ] +# xx --email xxx --login --ssh-pubkey xxx --raw-email email-file +# samba mount +# ssh logshn (huawei, ) (install pubkey / send password) + defaults = relevant_defaults(names) -JUMPER_IP = defaults['JUMPER_IP'] +JUMPER_HOST = defaults['JUMPER_HOST'] JUMPER_PORT = defaults['JUMPER_PORT'] CRYSTAL_INTRANET = defaults['CRYSTAL_INTRANET'] SEND_MAIL_PORT = defaults['SEND_MAIL_PORT'] -def build_message(email, message_id, infos) +def build_message(email, infos) message = <<~EMAIL_MESSAGE To: #{email} - Message-ID: #{message_id} Subject: jumper account is ready Dear #{email} @@ -79,67 +85,25 @@ def build_message(email, message_id, infos) return message end -def email_addr(mail_content) - msg = 'not an applying account email' - - raise msg unless mail_content.subject =~ /apply ssh account/i - - email = mail_content.from.join(',') - - return email -end - -# def check_email_available(mail_content, email) -# oos_list = File.read('/c/upstream-repos/repo_list').split(/\n/) -# url = mail_content.body.decoded.split(/\n/).find { |line| line =~ /https?:\/\// } -# base_url = url.split('/')[0,5].join('/') -# message = 'The url is not in upstream repo_list' -# -# raise message unless oos_list.include? base_url -# -# url_fdback = %x(curl #{url}) -# email_index = url_fdback.index email -# -# message = 'No commit info found from the url for the email' -# raise message unless email_index -# end - -def email_message_id(mail_content) - message_id = mail_content.message_id - return message_id -end - -def pub_key_value(mail_content) - pub_key = mail_content.body.decoded.split(/\n/).find { |line| line =~ /ssh-rsa/ } - return pub_key -end - def account_info(pub_key) - account_info_str = %x(curl -XGET '#{JUMPER_IP}:#{JUMPER_PORT}/assign_account' -d "pub_key: #{pub_key}") + account_info_str = if pub_key.nil? + %x(curl -XGET '#{JUMPER_HOST}:#{JUMPER_PORT}/assign_account') + else + %x(curl -XGET '#{JUMPER_HOST}:#{JUMPER_PORT}/assign_account' -d "pub_key: #{pub_key}") + end account_info = JSON.parse account_info_str return account_info end -def send_account(mail_content) - email = email_addr(mail_content) - message_id = email_message_id(mail_content) - # check_email_available(mail_content, email) - - pub_key = pub_key_value(mail_content) +def send_account(email, pub_key) acct_info = account_info(pub_key) - message = build_message(email, message_id, acct_info) + message = build_message(email, acct_info) %x(curl -XPOST '#{CRYSTAL_INTRANET}:#{SEND_MAIL_PORT}/send_mail_text' -d "#{message}") end -def read_mail_content(mail_file) - mail_content = Mail.read(mail_file) - - return mail_content -end - -mail_file = ARGV[0] -mail_content = read_mail_content(mail_file) -send_account(mail_content) +email = ARGV[0] +pub_key = ARGV[1] +send_account(email, pub_key) -- 2.23.0

1 0

[PATCH compass-ci 1/2] container/assign-account: get_account_info.rb fix bugs
by Luan Shengde 14 Oct '20

14 Oct '20

fix bugs: unexpected errors if there is no pub_key /usr/share/ruby/json/common.rb:156:in `parse': 765: unexpected token at 'NoMethodError: undefined method `[]' for nil:NilClass (JSON::ParserError) /usr/local/bin/get_account_info.rb:96:in `setup_jumper_account_info' /usr/local/bin/assign-account.rb:24:in `block in <main>' Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/assign-account/get_account_info.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/container/assign-account/get_account_info.rb b/container/assign-account/get_account_info.rb index 6c211a4..2f93d5b 100755 --- a/container/assign-account/get_account_info.rb +++ b/container/assign-account/get_account_info.rb @@ -33,7 +33,7 @@ setup_jumper_account_info build_account_name read_jumper_info setup_authorized_key - + the returned data for setup_jumper_account_info like: { "account" => "guest", @@ -93,15 +93,15 @@ class AccountStorage def setup_jumper_account_info account_info = read_account_info jumper_info = read_jumper_info - pub_key = @data['pub_key'] + pub_key = @data['pub_key'] unless @data.nil? jumper_ip = jumper_info[0].chomp jumper_port = jumper_info[1].chomp account = account_info[0] - passwd = if pub_key - 'Use pub_key to login' - else + passwd = if pub_key.nil? account_info[1] + else + 'Use pub_key to login' end jumper_account_info = { 'account' => account, -- 2.23.0

1 0

[PATCH v5 lkp-tests] lib: add forward_port.sh
by Zhang Yale 14 Oct '20

14 Oct '20

Provide a login port for user, determine whether to send the ssh_port message based on the uuid. Signed-off-by: Zhang Yale <zhangyale3(a)huawei.com> --- lib/forward_port.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100755 lib/forward_port.sh diff --git a/lib/forward_port.sh b/lib/forward_port.sh new file mode 100755 index 00000000..a2264e62 --- /dev/null +++ b/lib/forward_port.sh @@ -0,0 +1,23 @@ +#!/bin/bash +# uuid + +. $LKP_SRC/lib/http.sh + +sshr_ip=$LKP_SERVER +sshr_port=5050 +[ -n "$sshr_port_len" ] || sshr_port_len=2000 +[ -n "$sshr_port_base" ] || sshr_port_base=50000 + +get_port() +{ + [ -n "$uuid" ] || return + for i in $(seq 1 10) + do + port=$(($(date +%s%N)%"$sshr_port_len"+"$sshr_port_base")) + ssh -o StrictHostKeyChecking=no \ + -o ExitOnForwardFailure=yes -o TCPKeepAlive=yes -Nf -R $port:localhost:22 sshr@"$sshr_ip" -p "$sshr_port" &>/dev/null + [ $? -eq 0 ] || continue + echo "$port" + break + done +} -- 2.23.0

1 1

[PATCH v5 lkp-tests] lib: add forward_port.sh
by Zhang Yale 14 Oct '20

14 Oct '20

Provide a login port for user, determine whether to send the ssh_port message based on the uuid. Signed-off-by: Zhang Yale <zhangyale3(a)huawei.com> --- lib/forward_port.sh | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100755 lib/forward_port.sh diff --git a/lib/forward_port.sh b/lib/forward_port.sh new file mode 100755 index 00000000..7ebc8547 --- /dev/null +++ b/lib/forward_port.sh @@ -0,0 +1,24 @@ +#!/bin/bash +# uuid + +. $LKP_SRC/lib/http.sh + +sshr_ip=$LKP_SERVER +sshr_port=5050 +[ -n "$sshr_port_len" ] || sshr_port_len=2000 +[ -n "$sshr_port_base" ] || sshr_port_base=50000 + +get_port() +{ + [ -n "$uuid" ] || return + for i in $(seq 1 10) + do + port=$(($(date +%s%N)%"$sshr_port_len"+"$sshr_port_base")) + ssh -o StrictHostKeyChecking=no \ + -o ExitOnForwardFailure=yes -o TCPKeepAlive=yes -Nf -R $port:localhost:22 sshr@"$sshr_ip" -p "$sshr_port" &>/dev/null + [ $? -eq 0 ] || continue + echo "$port" + break + done +} + -- 2.23.0

1 1

[PATCH v2 compass-ci] generate conserver configuration file
by Cui Yili 14 Oct '20

14 Oct '20

Signed-off-by: cuiyili <2268260388(a)qq.com> --- container/conserver/conserver-head.cf | 16 +++++++++++ container/conserver/generate_conserver | 37 ++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 container/conserver/conserver-head.cf create mode 100755 container/conserver/generate_conserver diff --git a/container/conserver/conserver-head.cf b/container/conserver/conserver-head.cf new file mode 100644 index 0000000..6648f88 --- /dev/null +++ b/container/conserver/conserver-head.cf @@ -0,0 +1,16 @@ +# This is a fairly basic configuration file that interacts with one + +default * { + logfile /srv/cci/serial/logs/&; # '&' is replaced with console name + timestamp 1hab; # write timestamps + rw *; # allow all users + type exec; + master localhost; + portbase 2000; # port numbers start at 2001 and + portinc 100; # go up by 1 (port #1 == 2001, etc) +} + +access * { + trusted 127.0.0.1; +} + diff --git a/container/conserver/generate_conserver b/container/conserver/generate_conserver new file mode 100755 index 0000000..0d01350 --- /dev/null +++ b/container/conserver/generate_conserver @@ -0,0 +1,37 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ + +git clone file:///$CCI_REPOS/lab-$lab.git > /dev/null 2>&1 || exit 1 + +cat conserver-head.cf > conserver.cf + +# lab-z9/hosts/xxx +# nr_node: x +# nr_cpu: xx +# memory: xx +# nr_hdd_partitions: x +# hdd_partitions: +# - xx +# rootfs_partition: +# - xx +# mac_addr: +# - xx:xx:xx:xx:xx:xx +# model_name: xx-xx +for host in $(ls lab-$lab/hosts/*) +do + ipmi_ip=$(grep -q "ipmi_ip:" $host | awk '{print $2}') + [[ "$ipmi_ip" =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]] || continue + + textbox=$host + [ -n "$textbox" ] || continue + + cat <<EOF >> conserver.cf +console $textbox { + exec /usr/local/bin/ipmi-sol $ipmi_ip; +} + +EOF + +done + +[ -d "$PWD/lab-$lab" ] && rm -rf "$PWD/lab-$lab" -- 2.23.0

2 1

[PATCH v4 lkp-tests] lib: add transfer_port.sh
by Zhang Yale 14 Oct '20

14 Oct '20

Provide a login port for user, determine whether to send the ssh_port message based on the uuid. Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- lib/transfer_port.sh | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100755 lib/transfer_port.sh diff --git a/lib/transfer_port.sh b/lib/transfer_port.sh new file mode 100755 index 00000000..e1eed384 --- /dev/null +++ b/lib/transfer_port.sh @@ -0,0 +1,24 @@ +#!/bin/bash +# uuid + +. $LKP_SRC/lib/http.sh + +sshr_ip=$LKP_SERVER +sshr_port=5050 +[ -n "$sshr_port_len" ] || sshr_port_len=10 +[ -n "$sshr_port_base" ] || sshr_port_base=11333 + +get_port() +{ + [ -n "$uuid" ] || return + for i in $(seq 1 10) + do + port=$(($(date +%s%N)%"$sshr_port_len"+"$sshr_port_base")) + ssh -o StrictHostKeyChecking=no \ + -o ExitOnForwardFailure=yes -o TCPKeepAlive=yes -Nf -R $port:localhost:22 sshr@"$sshr_ip" -p "$sshr_port" &>/dev/null + [ $? -eq 0 ] || continue + echo "$port" + break + done +} + -- 2.23.0

2 8

[PATCH v2 lkp-tests] pkg: add lmbench.patch to PKGBUILD
by Bai Jing 14 Oct '20

14 Oct '20

Signed-off-by: Bai Jing <799286817(a)qq.com> --- pkg/lmbench3/PKGBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/lmbench3/PKGBUILD b/pkg/lmbench3/PKGBUILD index 82667fcb..ee96e26b 100644 --- a/pkg/lmbench3/PKGBUILD +++ b/pkg/lmbench3/PKGBUILD @@ -5,8 +5,9 @@ pkgdesc="A suite of simple, portable, ANSI/C microbenchmarks for UNIX/POSIX, mea arch=('i386' 'x86_64') url="http://www.bitmover.com/lmbench/" license=('GPL') -source=("https://github.com/intel/lmbench.git") -md5sums=('SKIP') +source=("https://github.com/intel/lmbench.git" + "lmbench.patch") +md5sums=('SKIP' 'SKIP') build() { cd "$srcdir/$pkgname" -- 2.23.0

1 0

[PATCH v2 compass-ci] fix: sched: use testbox to find and submit idle jobs
by Ren Wen 14 Oct '20

14 Oct '20

Use testbox to find and submit idle jobs because of different types of physical machines have different type of jobs. Before: find and submit idle jobs using tbox_group queues. Now: find and submit using testbox queues. Example: There has a testbox: taishan200-2280-2s48p-256g--a14 Before: using 'taishan200-2280-2s48p-256g' Now: using 'taishan200-2280-2s48p-256g--a14' Signed-off-by: Ren Wen <15991987063(a)163.com> --- src/lib/sched.cr | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index 2fbf05d..a61a57b 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -432,7 +432,7 @@ class Sched # when find no job at "sched/#{tbox_group}" # try to get from "sched/#{tbox_group}/idle" - return get_idle_job(tbox_group, testbox) + return get_idle_job(tbox, testbox) end private def prepare_job(queue_name, testbox) @@ -457,20 +457,21 @@ class Sched return job end - private def get_idle_job(tbox_group, testbox) - job = prepare_job("sched/#{tbox_group}/idle", testbox) + private def get_idle_job(tbox, testbox) + queue_name = "sched/#{tbox}/idle" + job = prepare_job(queue_name, testbox) # if there has no idle job, auto submit and get 1 if job.nil? - auto_submit_idle_job(tbox_group) - job = prepare_job("sched/#{tbox_group}/idle", testbox) + auto_submit_idle_job(tbox) + job = prepare_job(queue_name, testbox) end return job end - def auto_submit_idle_job(tbox_group) - full_path_patterns = "#{ENV["CCI_REPOS"]}/lab-#{ENV["lab"]}/allot/idle/#{tbox_group}/*.yaml" + def auto_submit_idle_job(tbox) + full_path_patterns = "#{ENV["CCI_REPOS"]}/lab-#{ENV["lab"]}/allot/idle/#{tbox}/*.yaml" extra_job_fields = [ "idle_job=true", "FLUENTD_SERVER_HOST=#{ENV["FLUENTD_SERVER_HOST"]}", @@ -479,7 +480,7 @@ class Sched Jobfile::Operate.auto_submit_job( full_path_patterns, - "testbox: #{tbox_group}", + "testbox: #{tbox}", extra_job_fields) if Dir.glob(full_path_patterns).size > 0 end -- 2.23.0

2 4

[PATCH compass-ci] add insecure-registries parameter for docker client
by Xiao Shenwei 14 Oct '20

14 Oct '20

in some physical machine docker-pull dc-centos:7 Error: pull image from local repository Error response from daemon: Get https://172.168.131.2:5001/v2/: Forbidden add insecure-registries into /etc/docker/daemon.json Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- sparrow/0-package/common | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sparrow/0-package/common b/sparrow/0-package/common index 05becdf..2c7de37 100755 --- a/sparrow/0-package/common +++ b/sparrow/0-package/common @@ -24,6 +24,8 @@ cat >> /etc/modules-load.d/cifs <<EOF cifs EOF +: ${DOCKER_REGISTRY_HOST:="127.0.0.1"} +: ${DOCKER_REGISTRY_PORT:=5001} cat > /etc/docker/daemon.json <<EOF { "log-driver": "fluentd", @@ -31,7 +33,8 @@ cat > /etc/docker/daemon.json <<EOF "fluentd-address": "localhost:24224", "fluentd-async-connect": "true", "tag": "{{.Name}}" - } + }, + "insecure-registries": ["$DOCKER_REGISTRY_HOST:$DOCKER_REGISTRY_PORT"] } EOF -- 2.23.0

1 0

[PATCH lkp-tests 2/2] lib/job.rb: define files check new directory
by Wei Jihui 14 Oct '20

14 Oct '20

git status just show new directory, find all files in directory like $LKP_SRC/pkg/$program/ Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- lib/job.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/job.rb b/lib/job.rb index 6497f0f1..db3da63d 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -593,7 +593,15 @@ class Job git_status_line.each do |line| git_file = line.split[-1] git_file = File.join("#{LKP_SRC}", git_file) - git_files_list << git_file if File.exist?(git_file) + next unless File.exist?(git_file) + + if File.directory?(git_file) + Dir.glob(File.join(git_file, '*')).each do |f| + git_files_list << f + end + else + git_files_list << git_file + end end git_diff = %x(cd #{LKP_SRC} && git diff --name-only origin/master) -- 2.23.0

2 1

[PATCH lkp-tests 1/2] lib/job.rb: add define files check for cci-makepkg
by Wei Jihui 14 Oct '20

14 Oct '20

Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- lib/job.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/job.rb b/lib/job.rb index c3966546..6497f0f1 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -617,9 +617,9 @@ class Job program_name_list = programs_params_hash.keys || [] program_name_list.each do |program| - # if job is run as makepkg, makepkg-deps, pack-deps, + # if job is run as makepkg, makepkg-deps, pack-deps, cci-makepkg # then use makepkg's benchmark as program to get define_files - if ["makepkg", "makepkg-deps", "pack-deps"].include?(program) + if %w(makepkg makepkg-deps pack-deps cci-makepkg).include?(program) program = programs_params_hash[program]["benchmark"] end -- 2.23.0

1 0

[PATCH lkp-tests] tests: add get_ipmi_ip function to host-info
by Zhang Yu 14 Oct '20

14 Oct '20

Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- tests/host-info | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/host-info b/tests/host-info index a57855dc..6ee8df21 100755 --- a/tests/host-info +++ b/tests/host-info @@ -80,6 +80,11 @@ get_partitions() fi } +get_ipmi_ip() +{ + echo "ipmi_ip: $(ipmitool lan print |grep -E "IP Address\s*:" | awk '{print $4}')" +} + main() { get_node @@ -87,6 +92,7 @@ main() get_partitions get_mac get_model_name + get_ipmi_ip } main -- 2.23.0

3 5

[PATCH lab-z9 4/4] a101-a107 hosts file
by Zhang Dewan 14 Oct '20

14 Oct '20

--- hosts/m | 44 ++++---------------------- hosts/taishan200-2280-2s48p-256g--a101 | 22 +++++++++++++ hosts/taishan200-2280-2s48p-256g--a102 | 22 +++++++++++++ hosts/taishan200-2280-2s48p-256g--a103 | 24 ++++++++++++++ hosts/taishan200-2280-2s48p-256g--a104 | 24 ++++++++++++++ hosts/taishan200-2280-2s48p-256g--a105 | 24 ++++++++++++++ hosts/taishan200-2280-2s48p-256g--a106 | 24 ++++++++++++++ hosts/taishan200-2280-2s48p-256g--a107 | 24 ++++++++++++++ 8 files changed, 171 insertions(+), 37 deletions(-) create mode 100644 hosts/taishan200-2280-2s48p-256g--a101 create mode 100644 hosts/taishan200-2280-2s48p-256g--a102 create mode 100644 hosts/taishan200-2280-2s48p-256g--a103 create mode 100644 hosts/taishan200-2280-2s48p-256g--a104 create mode 100644 hosts/taishan200-2280-2s48p-256g--a105 create mode 100644 hosts/taishan200-2280-2s48p-256g--a106 create mode 100644 hosts/taishan200-2280-2s48p-256g--a107 diff --git a/hosts/m b/hosts/m index ae2c84f..aca1952 100644 --- a/hosts/m +++ b/hosts/m @@ -1,37 +1,7 @@ -taishan200-2280-2s48p-256g--a13 a13 -taishan200-2280-2s48p-256g--a14 a14 -taishan200-2280-2s48p-256g--a15 a15 -taishan200-2280-2s48p-256g--a17 a17 -taishan200-2280-2s48p-256g--a18 a18 -taishan200-2280-2s48p-256g--a19 a19 -taishan200-2280-2s48p-256g--a21 a21 -taishan200-2280-2s48p-256g--a22 a22 -taishan200-2280-2s48p-256g--a24 a24 -taishan200-2280-2s48p-256g--a25 a25 -taishan200-2280-2s48p-256g--a26 a26 -taishan200-2280-2s48p-256g--a27 a27 -taishan200-2280-2s48p-256g--a28 a28 -taishan200-2280-2s48p-256g--a29 a29 -taishan200-2280-2s48p-256g--a30 a30 -taishan200-2280-2s48p-256g--a31 a31 -taishan200-2280-2s48p-256g--a32 a32 -taishan200-2280-2s48p-256g--a33 a33 -taishan200-2280-2s48p-256g--a34 a34 -taishan200-2280-2s48p-256g--a35 a35 -taishan200-2280-2s48p-256g--a52 a52 -taishan200-2280-2s48p-256g--a53 a53 -taishan200-2280-2s48p-256g--a60 a60 -taishan200-2280-2s48p-256g--a61 a61 -taishan200-2280-2s48p-256g--a62 a62 -taishan200-2280-2s48p-256g--a66 a66 -taishan200-2280-2s48p-256g--a67 a67 -taishan200-2280-2s48p-256g--a68 a68 -taishan200-2280-2s48p-256g--a69 a69 -taishan200-2280-2s48p-256g--a70 a70 -taishan200-2280-2s48p-256g--a71 a71 -taishan200-2280-2s64p-256g--a10 a10 -taishan200-2280-2s64p-256g--a36 a36 -taishan200-2280-2s64p-256g--a40 a40 -taishan200-2280-2s64p-256g--a41 a41 -taishan200-2280-2s64p-256g--a42 a42 -taishan200-2280-2s64p-256g--a9 a9 +taishan200-2280-2s48p-256g--a101 a101 +taishan200-2280-2s48p-256g--a102 a102 +taishan200-2280-2s48p-256g--a103 a103 +taishan200-2280-2s48p-256g--a104 a104 +taishan200-2280-2s48p-256g--a105 a105 +taishan200-2280-2s48p-256g--a106 a106 +taishan200-2280-2s48p-256g--a107 a107 diff --git a/hosts/taishan200-2280-2s48p-256g--a101 b/hosts/taishan200-2280-2s48p-256g--a101 new file mode 100644 index 0000000..1226913 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a101 @@ -0,0 +1,22 @@ +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 3 +nr_ssd_partitions: 1 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b89192e1 + - /dev/disk/by-id/scsi-350000399b88bf66d + - /dev/disk/by-id/scsi-350000399b88bef85 +ssd_partitions: + - /dev/disk/by-id/ata-INTEL_SSDSC2KB480G8_BTYF94730FF4480BGN +mac_addr: + - 44:67:47:d7:6c:9c + - 44:67:47:d7:6c:9d + - 44:67:47:d7:6c:9e + - 44:67:47:d7:6c:9f + - 44:67:47:d7:6c:a0 + - 44:67:47:d7:6c:a1 + - 44:67:47:d7:6c:a2 + - 44:67:47:d7:6c:a3 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.6 diff --git a/hosts/taishan200-2280-2s48p-256g--a102 b/hosts/taishan200-2280-2s48p-256g--a102 new file mode 100644 index 0000000..3d59dd5 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a102 @@ -0,0 +1,22 @@ +nr_node: 4 +nr_cpu: 96 +memory: 512G +nr_hdd_partitions: 2 +nr_ssd_partitions: 2 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8919395 + - /dev/disk/by-id/scsi-350000399b88bfbc9 +ssd_partitions: + - /dev/disk/by-id/ata-SAMSUNG_MZ7LH1T9HMLT-00005_S455NY0MB55506 + - /dev/disk/by-id/ata-SAMSUNG_MZ7LH1T9HMLT-00005_S455NY0MB55187 +mac_addr: + - 44:67:47:c9:ea:30 + - 44:67:47:c9:ea:31 + - 44:67:47:c9:ea:32 + - 44:67:47:c9:ea:33 + - 44:67:47:c9:ea:34 + - 44:67:47:c9:ea:35 + - 44:67:47:c9:ea:36 + - 44:67:47:c9:ea:37 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.7 diff --git a/hosts/taishan200-2280-2s48p-256g--a103 b/hosts/taishan200-2280-2s48p-256g--a103 new file mode 100644 index 0000000..4afef3c --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a103 @@ -0,0 +1,24 @@ +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88bdc69 + - /dev/disk/by-id/scsi-350000399b88bdd85 + - /dev/disk/by-id/scsi-350000399b88bdc4d + - /dev/disk/by-id/scsi-350000399b88bdc7d +mac_addr: + - 44:67:47:c9:d8:b8 + - 44:67:47:c9:d8:b9 + - 44:67:47:c9:d8:ba + - 44:67:47:c9:d8:bb + - 44:67:47:c9:d8:bc + - 44:67:47:c9:d8:bd + - 44:67:47:c9:d8:be + - 44:67:47:c9:d8:bf + - cc:05:77:ee:b5:4f + - cc:05:77:ee:b5:50 + - cc:05:77:ee:b5:51 + - cc:05:77:ee:b5:52 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.8 diff --git a/hosts/taishan200-2280-2s48p-256g--a104 b/hosts/taishan200-2280-2s48p-256g--a104 new file mode 100644 index 0000000..bf4a494 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a104 @@ -0,0 +1,24 @@ +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8892431 + - /dev/disk/by-id/scsi-350000399b8892f81 + - /dev/disk/by-id/scsi-350000399b8891c49 + - /dev/disk/by-id/scsi-350000399b88930d1 +mac_addr: + - 44:67:47:d7:6d:f0 + - 44:67:47:d7:6d:f1 + - 44:67:47:d7:6d:f2 + - 44:67:47:d7:6d:f3 + - 44:67:47:d7:6d:f4 + - 44:67:47:d7:6d:f5 + - 44:67:47:d7:6d:f6 + - 44:67:47:d7:6d:f7 + - cc:05:77:ee:b9:6f + - cc:05:77:ee:b9:70 + - cc:05:77:ee:b9:71 + - cc:05:77:ee:b9:72 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.9 diff --git a/hosts/taishan200-2280-2s48p-256g--a105 b/hosts/taishan200-2280-2s48p-256g--a105 new file mode 100644 index 0000000..3c28d2d --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a105 @@ -0,0 +1,24 @@ +nr_node: 4 +nr_cpu: 96 +memory: 512G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b891945d + - /dev/disk/by-id/scsi-350000399b8919135 + - /dev/disk/by-id/scsi-350000399b8919699 + - /dev/disk/by-id/scsi-350000399b89190d5 +mac_addr: + - 44:67:47:d7:76:c4 + - 44:67:47:d7:76:c5 + - 44:67:47:d7:76:c6 + - 44:67:47:d7:76:c7 + - 44:67:47:d7:76:c8 + - 44:67:47:d7:76:c9 + - 44:67:47:d7:76:ca + - 44:67:47:d7:76:cb + - cc:05:77:ee:b2:8f + - cc:05:77:ee:b2:90 + - cc:05:77:ee:b2:91 + - cc:05:77:ee:b2:92 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.10 diff --git a/hosts/taishan200-2280-2s48p-256g--a106 b/hosts/taishan200-2280-2s48p-256g--a106 new file mode 100644 index 0000000..a7b44a0 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a106 @@ -0,0 +1,24 @@ +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b883bf99 + - /dev/disk/by-id/scsi-350000399b883ba89 + - /dev/disk/by-id/scsi-350000399b883b94d + - /dev/disk/by-id/scsi-350000399b883b981 +mac_addr: + - 44:67:47:86:1c:30 + - 44:67:47:86:1c:31 + - 44:67:47:86:1c:32 + - 44:67:47:86:1c:33 + - 44:67:47:86:1c:34 + - 44:67:47:86:1c:35 + - 44:67:47:86:1c:36 + - 44:67:47:86:1c:37 + - cc:05:77:ee:b7:df + - cc:05:77:ee:b7:e0 + - cc:05:77:ee:b7:e1 + - cc:05:77:ee:b7:e2 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.11 diff --git a/hosts/taishan200-2280-2s48p-256g--a107 b/hosts/taishan200-2280-2s48p-256g--a107 new file mode 100644 index 0000000..9d20e57 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a107 @@ -0,0 +1,24 @@ +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8917c39 + - /dev/disk/by-id/scsi-350000399b8918005 + - /dev/disk/by-id/scsi-350000399b8900a4d + - /dev/disk/by-id/scsi-350000399b8900799 +mac_addr: + - 84:46:fe:73:a2:71 + - 84:46:fe:73:a2:72 + - 84:46:fe:73:a2:73 + - 84:46:fe:73:a2:74 + - 84:46:fe:73:a2:75 + - 84:46:fe:73:a2:76 + - 84:46:fe:73:a2:77 + - 84:46:fe:73:a2:78 + - 44:a1:91:35:1a:70 + - 44:a1:91:35:1a:71 + - 44:a1:91:35:1a:72 + - 44:a1:91:35:1a:73 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.12 -- 2.23.0

1 0

[PATCH lab-z9 3/4] hosts file add ipmi_ip
by Zhang Dewan 14 Oct '20

14 Oct '20

--- hosts/taishan200-2280-2s48p-256g--a13 | 2 +- hosts/taishan200-2280-2s48p-256g--a14 | 2 +- hosts/taishan200-2280-2s48p-256g--a15 | 2 +- hosts/taishan200-2280-2s48p-256g--a17 | 2 +- hosts/taishan200-2280-2s48p-256g--a18 | 2 +- hosts/taishan200-2280-2s48p-256g--a19 | 2 +- hosts/taishan200-2280-2s48p-256g--a21 | 2 +- hosts/taishan200-2280-2s48p-256g--a22 | 2 +- hosts/taishan200-2280-2s48p-256g--a24 | 2 +- hosts/taishan200-2280-2s48p-256g--a25 | 2 +- hosts/taishan200-2280-2s48p-256g--a26 | 2 +- hosts/taishan200-2280-2s48p-256g--a27 | 2 +- hosts/taishan200-2280-2s48p-256g--a28 | 2 +- hosts/taishan200-2280-2s48p-256g--a29 | 2 +- hosts/taishan200-2280-2s48p-256g--a30 | 2 +- hosts/taishan200-2280-2s48p-256g--a31 | 2 +- hosts/taishan200-2280-2s48p-256g--a32 | 2 +- hosts/taishan200-2280-2s48p-256g--a33 | 2 +- hosts/taishan200-2280-2s48p-256g--a34 | 2 +- hosts/taishan200-2280-2s48p-256g--a52 | 2 +- hosts/taishan200-2280-2s48p-256g--a53 | 2 +- hosts/taishan200-2280-2s48p-256g--a60 | 2 +- hosts/taishan200-2280-2s48p-256g--a61 | 2 +- hosts/taishan200-2280-2s48p-256g--a62 | 2 +- hosts/taishan200-2280-2s48p-256g--a66 | 2 +- hosts/taishan200-2280-2s48p-256g--a67 | 2 +- hosts/taishan200-2280-2s48p-256g--a68 | 2 +- hosts/taishan200-2280-2s48p-256g--a69 | 2 +- hosts/taishan200-2280-2s48p-256g--a70 | 2 +- hosts/taishan200-2280-2s48p-256g--a71 | 2 +- hosts/taishan200-2280-2s64p-256g--a10 | 2 +- hosts/taishan200-2280-2s64p-256g--a40 | 2 +- hosts/taishan200-2280-2s64p-256g--a41 | 2 +- hosts/taishan200-2280-2s64p-256g--a42 | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/hosts/taishan200-2280-2s48p-256g--a13 b/hosts/taishan200-2280-2s48p-256g--a13 index 7fca8ed..78cd2ee 100644 --- a/hosts/taishan200-2280-2s48p-256g--a13 +++ b/hosts/taishan200-2280-2s48p-256g--a13 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 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 7134e6c..162e687 100644 --- a/hosts/taishan200-2280-2s48p-256g--a14 +++ b/hosts/taishan200-2280-2s48p-256g--a14 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 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 5eb756c..3890ff0 100644 --- a/hosts/taishan200-2280-2s48p-256g--a15 +++ b/hosts/taishan200-2280-2s48p-256g--a15 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b841fff5 diff --git a/hosts/taishan200-2280-2s48p-256g--a17 b/hosts/taishan200-2280-2s48p-256g--a17 index e3168bf..f2146f8 100644 --- a/hosts/taishan200-2280-2s48p-256g--a17 +++ b/hosts/taishan200-2280-2s48p-256g--a17 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 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 12b6f71..e0ca747 100644 --- a/hosts/taishan200-2280-2s48p-256g--a18 +++ b/hosts/taishan200-2280-2s48p-256g--a18 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 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 a1541c4..2b3c440 100644 --- a/hosts/taishan200-2280-2s48p-256g--a19 +++ b/hosts/taishan200-2280-2s48p-256g--a19 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 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 4dea3c8..44c4e64 100644 --- a/hosts/taishan200-2280-2s48p-256g--a21 +++ b/hosts/taishan200-2280-2s48p-256g--a21 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 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 4fabb6f..b6d10af 100644 --- a/hosts/taishan200-2280-2s48p-256g--a22 +++ b/hosts/taishan200-2280-2s48p-256g--a22 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 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 64e1f6f..5e1571d 100644 --- a/hosts/taishan200-2280-2s48p-256g--a24 +++ b/hosts/taishan200-2280-2s48p-256g--a24 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 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 4dfb257..1f3f599 100644 --- a/hosts/taishan200-2280-2s48p-256g--a25 +++ b/hosts/taishan200-2280-2s48p-256g--a25 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 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 9ecfeee..b136009 100644 --- a/hosts/taishan200-2280-2s48p-256g--a26 +++ b/hosts/taishan200-2280-2s48p-256g--a26 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 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 a529631..96a387d 100644 --- a/hosts/taishan200-2280-2s48p-256g--a27 +++ b/hosts/taishan200-2280-2s48p-256g--a27 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 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 8682c85..5a4f298 100644 --- a/hosts/taishan200-2280-2s48p-256g--a28 +++ b/hosts/taishan200-2280-2s48p-256g--a28 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 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 ec17c19..5b7c0b8 100644 --- a/hosts/taishan200-2280-2s48p-256g--a29 +++ b/hosts/taishan200-2280-2s48p-256g--a29 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 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 41e1083..2c8d2d3 100644 --- a/hosts/taishan200-2280-2s48p-256g--a30 +++ b/hosts/taishan200-2280-2s48p-256g--a30 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 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 80abe0e..9aec903 100644 --- a/hosts/taishan200-2280-2s48p-256g--a31 +++ b/hosts/taishan200-2280-2s48p-256g--a31 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 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 3719131..d677838 100644 --- a/hosts/taishan200-2280-2s48p-256g--a32 +++ b/hosts/taishan200-2280-2s48p-256g--a32 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 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 13af4dc..d4df847 100644 --- a/hosts/taishan200-2280-2s48p-256g--a33 +++ b/hosts/taishan200-2280-2s48p-256g--a33 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 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 b0a1e8a..680cb6f 100644 --- a/hosts/taishan200-2280-2s48p-256g--a34 +++ b/hosts/taishan200-2280-2s48p-256g--a34 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88be219 diff --git a/hosts/taishan200-2280-2s48p-256g--a52 b/hosts/taishan200-2280-2s48p-256g--a52 index a3ea181..a64cdec 100644 --- a/hosts/taishan200-2280-2s48p-256g--a52 +++ b/hosts/taishan200-2280-2s48p-256g--a52 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 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 5d97218..148e747 100644 --- a/hosts/taishan200-2280-2s48p-256g--a53 +++ b/hosts/taishan200-2280-2s48p-256g--a53 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 2 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 5a122da..9e969b0 100644 --- a/hosts/taishan200-2280-2s48p-256g--a60 +++ b/hosts/taishan200-2280-2s48p-256g--a60 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 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 f1eb906..2992c6f 100644 --- a/hosts/taishan200-2280-2s48p-256g--a61 +++ b/hosts/taishan200-2280-2s48p-256g--a61 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 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 970d6ea..5262637 100644 --- a/hosts/taishan200-2280-2s48p-256g--a62 +++ b/hosts/taishan200-2280-2s48p-256g--a62 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b892d131 diff --git a/hosts/taishan200-2280-2s48p-256g--a66 b/hosts/taishan200-2280-2s48p-256g--a66 index 39b69b8..b7a3715 100644 --- a/hosts/taishan200-2280-2s48p-256g--a66 +++ b/hosts/taishan200-2280-2s48p-256g--a66 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 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 79f98db..2501f6e 100644 --- a/hosts/taishan200-2280-2s48p-256g--a67 +++ b/hosts/taishan200-2280-2s48p-256g--a67 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 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 37859dc..c51e348 100644 --- a/hosts/taishan200-2280-2s48p-256g--a68 +++ b/hosts/taishan200-2280-2s48p-256g--a68 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 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 5d607e7..964f79e 100644 --- a/hosts/taishan200-2280-2s48p-256g--a69 +++ b/hosts/taishan200-2280-2s48p-256g--a69 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 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 b3d1416..2424a9f 100644 --- a/hosts/taishan200-2280-2s48p-256g--a70 +++ b/hosts/taishan200-2280-2s48p-256g--a70 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 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 102ff96..501ea4b 100644 --- a/hosts/taishan200-2280-2s48p-256g--a71 +++ b/hosts/taishan200-2280-2s48p-256g--a71 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G mac_addr: - 44:67:47:d7:6d:e6 - 44:67:47:d7:6d:e7 diff --git a/hosts/taishan200-2280-2s64p-256g--a10 b/hosts/taishan200-2280-2s64p-256g--a10 index 3abe369..fcc6c63 100644 --- a/hosts/taishan200-2280-2s64p-256g--a10 +++ b/hosts/taishan200-2280-2s64p-256g--a10 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 128 -memory: 252G +memory: 256G nr_hdd_partitions: 1 nr_ssd_partitions: 1 hdd_partitions: diff --git a/hosts/taishan200-2280-2s64p-256g--a40 b/hosts/taishan200-2280-2s64p-256g--a40 index 1a806ee..3172475 100644 --- a/hosts/taishan200-2280-2s64p-256g--a40 +++ b/hosts/taishan200-2280-2s64p-256g--a40 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 128 -memory: 252G +memory: 256G nr_hdd_partitions: 2 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 5b22bcc..4253e1f 100644 --- a/hosts/taishan200-2280-2s64p-256g--a41 +++ b/hosts/taishan200-2280-2s64p-256g--a41 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 128 -memory: 252G +memory: 256G nr_hdd_partitions: 2 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 442b958..dce3cf0 100644 --- a/hosts/taishan200-2280-2s64p-256g--a42 +++ b/hosts/taishan200-2280-2s64p-256g--a42 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 128 -memory: 252G +memory: 256G nr_hdd_partitions: 2 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8918a11 -- 2.23.0

1 0

[PATCH lab-z9 2/4] host file add ipmi_ip
by Zhang Dewan 14 Oct '20

14 Oct '20

--- hosts/0001-add-new-hosts-file.patch | 913 ------------------ ...and-the-128G-s-host-will-be-added-to.patch | 454 --------- hosts/0003-hosts-file-add-ipmi_ip.patch | 411 -------- hosts/m | 37 + hosts/p | 10 + hosts/taishan200-2280-2s48p-256g--a11 | 20 - hosts/taishan200-2280-2s48p-256g--a13 | 20 + hosts/taishan200-2280-2s48p-256g--a14 | 20 + hosts/taishan200-2280-2s48p-256g--a15 | 20 + hosts/taishan200-2280-2s48p-256g--a17 | 20 + hosts/taishan200-2280-2s48p-256g--a18 | 20 + hosts/taishan200-2280-2s48p-256g--a19 | 20 + hosts/taishan200-2280-2s48p-256g--a21 | 20 + hosts/taishan200-2280-2s48p-256g--a22 | 20 + hosts/taishan200-2280-2s48p-256g--a24 | 8 +- hosts/taishan200-2280-2s48p-256g--a25 | 6 +- hosts/taishan200-2280-2s48p-256g--a26 | 20 + hosts/taishan200-2280-2s48p-256g--a27 | 20 + hosts/taishan200-2280-2s48p-256g--a28 | 20 + hosts/taishan200-2280-2s48p-256g--a29 | 20 + hosts/taishan200-2280-2s48p-256g--a30 | 20 + hosts/taishan200-2280-2s48p-256g--a31 | 20 + hosts/taishan200-2280-2s48p-256g--a32 | 20 + hosts/taishan200-2280-2s48p-256g--a33 | 20 + hosts/taishan200-2280-2s48p-256g--a34 | 20 + hosts/taishan200-2280-2s48p-256g--a35 | 21 + hosts/taishan200-2280-2s48p-256g--a52 | 20 + hosts/taishan200-2280-2s48p-256g--a53 | 18 + hosts/taishan200-2280-2s48p-256g--a60 | 20 + hosts/taishan200-2280-2s48p-256g--a61 | 20 + hosts/taishan200-2280-2s48p-256g--a62 | 20 + hosts/taishan200-2280-2s48p-256g--a66 | 6 +- hosts/taishan200-2280-2s48p-256g--a67 | 6 +- hosts/taishan200-2280-2s48p-256g--a68 | 6 +- hosts/taishan200-2280-2s48p-256g--a69 | 6 +- hosts/taishan200-2280-2s48p-256g--a70 | 6 +- hosts/taishan200-2280-2s48p-256g--a71 | 3 +- hosts/taishan200-2280-2s64p-256g--a10 | 9 +- hosts/taishan200-2280-2s64p-256g--a3 | 24 - hosts/taishan200-2280-2s64p-256g--a36 | 25 + hosts/taishan200-2280-2s64p-256g--a4 | 24 - hosts/taishan200-2280-2s64p-256g--a40 | 22 + hosts/taishan200-2280-2s64p-256g--a41 | 22 + hosts/taishan200-2280-2s64p-256g--a42 | 22 + hosts/taishan200-2280-2s64p-256g--a8 | 15 - hosts/taishan200-2280-2s64p-256g--a9 | 4 +- 46 files changed, 630 insertions(+), 1888 deletions(-) delete mode 100644 hosts/0001-add-new-hosts-file.patch delete mode 100644 hosts/0002-fix-memory-size-and-the-128G-s-host-will-be-added-to.patch delete mode 100644 hosts/0003-hosts-file-add-ipmi_ip.patch create mode 100644 hosts/m create mode 100644 hosts/p delete mode 100644 hosts/taishan200-2280-2s48p-256g--a11 create mode 100644 hosts/taishan200-2280-2s48p-256g--a13 create mode 100644 hosts/taishan200-2280-2s48p-256g--a14 create mode 100644 hosts/taishan200-2280-2s48p-256g--a15 create mode 100644 hosts/taishan200-2280-2s48p-256g--a17 create mode 100644 hosts/taishan200-2280-2s48p-256g--a18 create mode 100644 hosts/taishan200-2280-2s48p-256g--a19 create mode 100644 hosts/taishan200-2280-2s48p-256g--a21 create mode 100644 hosts/taishan200-2280-2s48p-256g--a22 create mode 100644 hosts/taishan200-2280-2s48p-256g--a26 create mode 100644 hosts/taishan200-2280-2s48p-256g--a27 create mode 100644 hosts/taishan200-2280-2s48p-256g--a28 create mode 100644 hosts/taishan200-2280-2s48p-256g--a29 create mode 100644 hosts/taishan200-2280-2s48p-256g--a30 create mode 100644 hosts/taishan200-2280-2s48p-256g--a31 create mode 100644 hosts/taishan200-2280-2s48p-256g--a32 create mode 100644 hosts/taishan200-2280-2s48p-256g--a33 create mode 100644 hosts/taishan200-2280-2s48p-256g--a34 create mode 100644 hosts/taishan200-2280-2s48p-256g--a35 create mode 100644 hosts/taishan200-2280-2s48p-256g--a52 create mode 100644 hosts/taishan200-2280-2s48p-256g--a53 create mode 100644 hosts/taishan200-2280-2s48p-256g--a60 create mode 100644 hosts/taishan200-2280-2s48p-256g--a61 create mode 100644 hosts/taishan200-2280-2s48p-256g--a62 delete mode 100644 hosts/taishan200-2280-2s64p-256g--a3 create mode 100644 hosts/taishan200-2280-2s64p-256g--a36 delete mode 100644 hosts/taishan200-2280-2s64p-256g--a4 create mode 100644 hosts/taishan200-2280-2s64p-256g--a40 create mode 100644 hosts/taishan200-2280-2s64p-256g--a41 create mode 100644 hosts/taishan200-2280-2s64p-256g--a42 delete mode 100644 hosts/taishan200-2280-2s64p-256g--a8 diff --git a/hosts/0001-add-new-hosts-file.patch b/hosts/0001-add-new-hosts-file.patch deleted file mode 100644 index 18318eb..0000000 --- a/hosts/0001-add-new-hosts-file.patch +++ /dev/null @@ -1,913 +0,0 @@ -From bdf38f06d38302d4510387bc41b1bdce52518665 Mon Sep 17 00:00:00 2001 -From: Zhang Dewan <513619464(a)qq.com> -Date: Fri, 9 Oct 2020 19:14:31 +0800 -Subject: [PATCH lab-z9 1/3] add new hosts file - ---- - hosts/taishan200-2280-2s48p-256g--a13 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a14 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a15 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a17 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a18 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a19 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a21 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a22 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a24 | 7 +++---- - hosts/taishan200-2280-2s48p-256g--a25 | 5 ++--- - hosts/taishan200-2280-2s48p-256g--a26 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a27 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a28 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a29 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a30 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a31 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a32 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a33 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a34 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a52 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a53 | 17 +++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a60 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a61 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a62 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a66 | 5 ++--- - hosts/taishan200-2280-2s48p-256g--a67 | 5 ++--- - hosts/taishan200-2280-2s48p-256g--a68 | 5 ++--- - hosts/taishan200-2280-2s48p-256g--a69 | 5 ++--- - hosts/taishan200-2280-2s48p-256g--a70 | 5 ++--- - hosts/taishan200-2280-2s48p-256g--a71 | 2 +- - hosts/taishan200-2280-2s64p-256g--a10 | 8 ++++++-- - hosts/taishan200-2280-2s64p-256g--a36 | 24 ++++++++++++++++++++++++ - hosts/taishan200-2280-2s64p-256g--a40 | 21 +++++++++++++++++++++ - hosts/taishan200-2280-2s64p-256g--a41 | 21 +++++++++++++++++++++ - hosts/taishan200-2280-2s64p-256g--a42 | 21 +++++++++++++++++++++ - hosts/taishan200-2280-2s64p-256g--a9 | 5 ++--- - 36 files changed, 527 insertions(+), 28 deletions(-) - create mode 100644 hosts/taishan200-2280-2s48p-256g--a13 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a14 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a15 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a17 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a18 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a19 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a21 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a22 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a26 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a27 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a28 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a29 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a30 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a31 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a32 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a33 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a34 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a52 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a53 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a60 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a61 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a62 - create mode 100644 hosts/taishan200-2280-2s64p-256g--a36 - create mode 100644 hosts/taishan200-2280-2s64p-256g--a40 - create mode 100644 hosts/taishan200-2280-2s64p-256g--a41 - create mode 100644 hosts/taishan200-2280-2s64p-256g--a42 - -diff --git a/hosts/taishan200-2280-2s48p-256g--a13 b/hosts/taishan200-2280-2s48p-256g--a13 -new file mode 100644 -index 0000000..1c8f554 ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a13 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-35000c500c2799bb3 -+ - /dev/disk/by-id/scsi-35000c500c278b18b -+ - /dev/disk/by-id/scsi-35000c500c279f96b -+ - /dev/disk/by-id/scsi-35000c500c2789b4b -+mac_addr: -+ - 44:67:47:97:2b:bf -+ - 44:67:47:97:2b:c0 -+ - 44:67:47:97:2b:c1 -+ - 44:67:47:97:2b:c2 -+ - 44:67:47:97:2b:c3 -+ - 44:67:47:97:2b:c4 -+ - 44:67:47:97:2b:c5 -+ - 44:67:47:97:2b:c6 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a14 b/hosts/taishan200-2280-2s48p-256g--a14 -new file mode 100644 -index 0000000..ae84bd5 ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a14 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b88b4475 -+ - /dev/disk/by-id/scsi-350000399b88b4371 -+ - /dev/disk/by-id/scsi-350000399b88b432d -+ - /dev/disk/by-id/scsi-350000399b88b4531 -+mac_addr: -+ - 44:67:47:c9:e9:c2 -+ - 44:67:47:c9:e9:c3 -+ - 44:67:47:c9:e9:c4 -+ - 44:67:47:c9:e9:c5 -+ - 44:67:47:c9:e9:c6 -+ - 44:67:47:c9:e9:c7 -+ - 44:67:47:c9:e9:c8 -+ - 44:67:47:c9:e9:c9 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a15 b/hosts/taishan200-2280-2s48p-256g--a15 -new file mode 100644 -index 0000000..7fa0b67 ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a15 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b841fff5 -+ - /dev/disk/by-id/scsi-350000399b841fcb9 -+ - /dev/disk/by-id/scsi-350000399b8420a0d -+ - /dev/disk/by-id/scsi-350000399b841ff55 -+mac_addr: -+ - 44:67:47:85:d4:9e -+ - 44:67:47:85:d4:9f -+ - 44:67:47:85:d4:a0 -+ - 44:67:47:85:d4:a1 -+ - 44:67:47:85:d4:a2 -+ - 44:67:47:85:d4:a3 -+ - 44:67:47:85:d4:a4 -+ - 44:67:47:85:d4:a5 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a17 b/hosts/taishan200-2280-2s48p-256g--a17 -new file mode 100644 -index 0000000..8be93de ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a17 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b88b44cd -+ - /dev/disk/by-id/scsi-350000399b88b4541 -+ - /dev/disk/by-id/scsi-350000399b88b4495 -+ - /dev/disk/by-id/scsi-350000399b88b48d1 -+mac_addr: -+ - 44:67:47:c9:ea:1c -+ - 44:67:47:c9:ea:1d -+ - 44:67:47:c9:ea:1e -+ - 44:67:47:c9:ea:1f -+ - 44:67:47:c9:ea:20 -+ - 44:67:47:c9:ea:21 -+ - 44:67:47:c9:ea:22 -+ - 44:67:47:c9:ea:23 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a18 b/hosts/taishan200-2280-2s48p-256g--a18 -new file mode 100644 -index 0000000..e86bdeb ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a18 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b891b4d1 -+ - /dev/disk/by-id/scsi-350000399b8890d59 -+ - /dev/disk/by-id/scsi-350000399b8890f65 -+ - /dev/disk/by-id/scsi-350000399b891b3c5 -+mac_addr: -+ - 84:46:fe:3d:a7:e9 -+ - 84:46:fe:3d:a7:ea -+ - 84:46:fe:3d:a7:eb -+ - 84:46:fe:3d:a7:ec -+ - 84:46:fe:3d:a7:ed -+ - 84:46:fe:3d:a7:ee -+ - 84:46:fe:3d:a7:ef -+ - 84:46:fe:3d:a7:f0 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a19 b/hosts/taishan200-2280-2s48p-256g--a19 -new file mode 100644 -index 0000000..0c4a60f ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a19 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b8923939 -+ - /dev/disk/by-id/scsi-350000399b8420b2d -+ - /dev/disk/by-id/scsi-350000399b891b5c5 -+ - /dev/disk/by-id/scsi-350000399b841f769 -+mac_addr: -+ - 44:67:47:85:d5:48 -+ - 44:67:47:85:d5:49 -+ - 44:67:47:85:d5:4a -+ - 44:67:47:85:d5:4b -+ - 44:67:47:85:d5:4c -+ - 44:67:47:85:d5:4d -+ - 44:67:47:85:d5:4e -+ - 44:67:47:85:d5:4f -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a21 b/hosts/taishan200-2280-2s48p-256g--a21 -new file mode 100644 -index 0000000..51b7709 ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a21 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b88bf2d5 -+ - /dev/disk/by-id/scsi-350000399b88bf5a5 -+ - /dev/disk/by-id/scsi-350000399b88bf279 -+ - /dev/disk/by-id/scsi-350000399b88bf24d -+mac_addr: -+ - 44:67:47:86:1b:e0 -+ - 44:67:47:86:1b:e1 -+ - 44:67:47:86:1b:e2 -+ - 44:67:47:86:1b:e3 -+ - 44:67:47:86:1b:e4 -+ - 44:67:47:86:1b:e5 -+ - 44:67:47:86:1b:e6 -+ - 44:67:47:86:1b:e7 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a22 b/hosts/taishan200-2280-2s48p-256g--a22 -new file mode 100644 -index 0000000..4de0ad0 ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a22 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b8919069 -+ - /dev/disk/by-id/scsi-350000399b8918c15 -+ - /dev/disk/by-id/scsi-350000399b8918c79 -+ - /dev/disk/by-id/scsi-350000399b8918cb9 -+mac_addr: -+ - 44:67:47:d7:6d:14 -+ - 44:67:47:d7:6d:15 -+ - 44:67:47:d7:6d:16 -+ - 44:67:47:d7:6d:17 -+ - 44:67:47:d7:6d:18 -+ - 44:67:47:d7:6d:19 -+ - 44:67:47:d7:6d:1a -+ - 44:67:47:d7:6d:1b -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a24 b/hosts/taishan200-2280-2s48p-256g--a24 -index f46bfab..f47947c 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a24 -+++ b/hosts/taishan200-2280-2s48p-256g--a24 -@@ -1,12 +1,11 @@ - nr_node: 4 - nr_cpu: 96 --memory: 256G --nr_hdd_partitions: 3 -+memory: 252G -+nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b8917d59 -- - /dev/disk/by-id/scsi-350000399b891790d - - /dev/disk/by-id/scsi-350000399b89185d9 --rootfs_partition: -+ - /dev/disk/by-id/scsi-350000399b891790d - - /dev/disk/by-id/scsi-350000399b8917ef1 - mac_addr: - - 44:67:47:c9:d8:f4 -diff --git a/hosts/taishan200-2280-2s48p-256g--a25 b/hosts/taishan200-2280-2s48p-256g--a25 -index ee5eeb3..2f270e8 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a25 -+++ b/hosts/taishan200-2280-2s48p-256g--a25 -@@ -1,12 +1,11 @@ - nr_node: 4 - nr_cpu: 96 --memory: 256G --nr_hdd_partitions: 3 -+memory: 252G -+nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b88b4499 - - /dev/disk/by-id/scsi-350000399b88b4455 - - /dev/disk/by-id/scsi-350000399b88b442d --rootfs_partition: - - /dev/disk/by-id/scsi-350000399b88b44f9 - mac_addr: - - 44:67:47:c9:ea:08 -diff --git a/hosts/taishan200-2280-2s48p-256g--a26 b/hosts/taishan200-2280-2s48p-256g--a26 -new file mode 100644 -index 0000000..b6de96e ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a26 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b88bf131 -+ - /dev/disk/by-id/scsi-350000399b88bfd8d -+ - /dev/disk/by-id/scsi-350000399b88bfe55 -+ - /dev/disk/by-id/scsi-350000399b88bef31 -+mac_addr: -+ - 44:67:47:c9:e9:40 -+ - 44:67:47:c9:e9:41 -+ - 44:67:47:c9:e9:42 -+ - 44:67:47:c9:e9:43 -+ - 44:67:47:c9:e9:44 -+ - 44:67:47:c9:e9:45 -+ - 44:67:47:c9:e9:46 -+ - 44:67:47:c9:e9:47 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a27 b/hosts/taishan200-2280-2s48p-256g--a27 -new file mode 100644 -index 0000000..b6d9945 ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a27 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b8918ea9 -+ - /dev/disk/by-id/scsi-350000399b8918bad -+ - /dev/disk/by-id/scsi-350000399b8918d05 -+ - /dev/disk/by-id/scsi-350000399b8919415 -+mac_addr: -+ - 44:67:47:d7:6d:3c -+ - 44:67:47:d7:6d:3d -+ - 44:67:47:d7:6d:3e -+ - 44:67:47:d7:6d:3f -+ - 44:67:47:d7:6d:40 -+ - 44:67:47:d7:6d:41 -+ - 44:67:47:d7:6d:42 -+ - 44:67:47:d7:6d:43 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a28 b/hosts/taishan200-2280-2s48p-256g--a28 -new file mode 100644 -index 0000000..ecebafc ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a28 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-35000c500cdf1eb07 -+ - /dev/disk/by-id/scsi-35000c500cdef4c6f -+ - /dev/disk/by-id/scsi-35000c500cdefac2b -+ - /dev/disk/by-id/scsi-35000c500cdefa75f -+mac_addr: -+ - 5c:e8:83:31:c8:20 -+ - 5c:e8:83:31:c8:21 -+ - 5c:e8:83:31:c8:22 -+ - 5c:e8:83:31:c8:23 -+ - 5c:e8:83:31:c8:24 -+ - 5c:e8:83:31:c8:25 -+ - 5c:e8:83:31:c8:26 -+ - 5c:e8:83:31:c8:27 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a29 b/hosts/taishan200-2280-2s48p-256g--a29 -new file mode 100644 -index 0000000..bdb13ca ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a29 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b8918425 -+ - /dev/disk/by-id/scsi-350000399b891841d -+ - /dev/disk/by-id/scsi-350000399b8917859 -+ - /dev/disk/by-id/scsi-350000399b8917a51 -+mac_addr: -+ - 44:67:47:c9:d8:ea -+ - 44:67:47:c9:d8:eb -+ - 44:67:47:c9:d8:ec -+ - 44:67:47:c9:d8:ed -+ - 44:67:47:c9:d8:ee -+ - 44:67:47:c9:d8:ef -+ - 44:67:47:c9:d8:f0 -+ - 44:67:47:c9:d8:f1 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a30 b/hosts/taishan200-2280-2s48p-256g--a30 -new file mode 100644 -index 0000000..810859b ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a30 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b883b881 -+ - /dev/disk/by-id/scsi-350000399b88bf83d -+ - /dev/disk/by-id/scsi-350000399b883bbbd -+ - /dev/disk/by-id/scsi-350000399b88bf48d -+mac_addr: -+ - 44:67:47:86:1b:cc -+ - 44:67:47:86:1b:cd -+ - 44:67:47:86:1b:ce -+ - 44:67:47:86:1b:cf -+ - 44:67:47:86:1b:d0 -+ - 44:67:47:86:1b:d1 -+ - 44:67:47:86:1b:d2 -+ - 44:67:47:86:1b:d3 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a31 b/hosts/taishan200-2280-2s48p-256g--a31 -new file mode 100644 -index 0000000..8f9d13b ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a31 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b883b929 -+ - /dev/disk/by-id/scsi-350000399b883bbe1 -+ - /dev/disk/by-id/scsi-350000399b883c059 -+ - /dev/disk/by-id/scsi-350000399b883bc9d -+mac_addr: -+ - 44:67:47:86:1b:ae -+ - 44:67:47:86:1b:af -+ - 44:67:47:86:1b:b0 -+ - 44:67:47:86:1b:b1 -+ - 44:67:47:86:1b:b2 -+ - 44:67:47:86:1b:b3 -+ - 44:67:47:86:1b:b4 -+ - 44:67:47:86:1b:b5 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a32 b/hosts/taishan200-2280-2s48p-256g--a32 -new file mode 100644 -index 0000000..66d9b68 ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a32 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b88bf141 -+ - /dev/disk/by-id/scsi-350000399b88bee25 -+ - /dev/disk/by-id/scsi-350000399b88bea59 -+ - /dev/disk/by-id/scsi-350000399b88be1d9 -+mac_addr: -+ - 44:67:47:c9:db:38 -+ - 44:67:47:c9:db:39 -+ - 44:67:47:c9:db:3a -+ - 44:67:47:c9:db:3b -+ - 44:67:47:c9:db:3c -+ - 44:67:47:c9:db:3d -+ - 44:67:47:c9:db:3e -+ - 44:67:47:c9:db:3f -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a33 b/hosts/taishan200-2280-2s48p-256g--a33 -new file mode 100644 -index 0000000..ef3b148 ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a33 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b8919555 -+ - /dev/disk/by-id/scsi-350000399b8918c4d -+ - /dev/disk/by-id/scsi-350000399b8919c3d -+ - /dev/disk/by-id/scsi-350000399b8919389 -+mac_addr: -+ - 44:67:47:d7:6c:c4 -+ - 44:67:47:d7:6c:c5 -+ - 44:67:47:d7:6c:c6 -+ - 44:67:47:d7:6c:c7 -+ - 44:67:47:d7:6c:c8 -+ - 44:67:47:d7:6c:c9 -+ - 44:67:47:d7:6c:ca -+ - 44:67:47:d7:6c:cb -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a34 b/hosts/taishan200-2280-2s48p-256g--a34 -new file mode 100644 -index 0000000..528ec82 ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a34 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b88be219 -+ - /dev/disk/by-id/scsi-350000399b88bdf71 -+ - /dev/disk/by-id/scsi-350000399b88bdb49 -+ - /dev/disk/by-id/scsi-350000399b891784d -+mac_addr: -+ - 44:67:47:c9:d9:26 -+ - 44:67:47:c9:d9:27 -+ - 44:67:47:c9:d9:28 -+ - 44:67:47:c9:d9:29 -+ - 44:67:47:c9:d9:2a -+ - 44:67:47:c9:d9:2b -+ - 44:67:47:c9:d9:2c -+ - 44:67:47:c9:d9:2d -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a52 b/hosts/taishan200-2280-2s48p-256g--a52 -new file mode 100644 -index 0000000..4353d4c ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a52 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-35000c500cdefd89b -+ - /dev/disk/by-id/scsi-35000c500cdefac67 -+ - /dev/disk/by-id/scsi-35000c500cdedee6f -+ - /dev/disk/by-id/scsi-35000c500cdedfdaf -+mac_addr: -+ - 5c:e8:83:31:c8:d4 -+ - 5c:e8:83:31:c8:d5 -+ - 5c:e8:83:31:c8:d6 -+ - 5c:e8:83:31:c8:d7 -+ - 5c:e8:83:31:c8:d8 -+ - 5c:e8:83:31:c8:d9 -+ - 5c:e8:83:31:c8:da -+ - 5c:e8:83:31:c8:db -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a53 b/hosts/taishan200-2280-2s48p-256g--a53 -new file mode 100644 -index 0000000..0df1cd9 ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a53 -@@ -0,0 +1,17 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 2 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-35000c500bd6aa4e3 -+ - /dev/disk/by-id/scsi-35000c500bd681acf -+mac_addr: -+ - 5c:e8:83:73:25:c9 -+ - 5c:e8:83:73:25:ca -+ - 5c:e8:83:73:25:cb -+ - 5c:e8:83:73:25:cc -+ - 5c:e8:83:73:25:cd -+ - 5c:e8:83:73:25:ce -+ - 5c:e8:83:73:25:cf -+ - 5c:e8:83:73:25:d0 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a60 b/hosts/taishan200-2280-2s48p-256g--a60 -new file mode 100644 -index 0000000..6986a8f ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a60 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-35000c500bd67640b -+ - /dev/disk/by-id/scsi-35000c500bd6707a7 -+ - /dev/disk/by-id/scsi-35000c500bd680dc3 -+ - /dev/disk/by-id/scsi-35000c500bd683a73 -+mac_addr: -+ - e0:00:84:2b:51:7d -+ - e0:00:84:2b:51:7e -+ - e0:00:84:2b:51:7f -+ - e0:00:84:2b:51:80 -+ - e0:00:84:2b:51:81 -+ - e0:00:84:2b:51:82 -+ - e0:00:84:2b:51:83 -+ - e0:00:84:2b:51:84 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a61 b/hosts/taishan200-2280-2s48p-256g--a61 -new file mode 100644 -index 0000000..1c198b8 ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a61 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399886a7869 -+ - /dev/disk/by-id/scsi-350000399886acc5d -+ - /dev/disk/by-id/scsi-350000399886b6861 -+ - /dev/disk/by-id/scsi-350000399886ac70d -+mac_addr: -+ - 44:67:47:c9:e4:b8 -+ - 44:67:47:c9:e4:b9 -+ - 44:67:47:c9:e4:ba -+ - 44:67:47:c9:e4:bb -+ - 44:67:47:c9:e4:bc -+ - 44:67:47:c9:e4:bd -+ - 44:67:47:c9:e4:be -+ - 44:67:47:c9:e4:bf -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a62 b/hosts/taishan200-2280-2s48p-256g--a62 -new file mode 100644 -index 0000000..26ab646 ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a62 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b892d131 -+ - /dev/disk/by-id/scsi-350000399b892d619 -+ - /dev/disk/by-id/scsi-350000399b892dc1d -+ - /dev/disk/by-id/scsi-350000399b892dbb5 -+mac_addr: -+ - 44:67:47:c9:e3:3a -+ - 44:67:47:c9:e3:3b -+ - 44:67:47:c9:e3:3c -+ - 44:67:47:c9:e3:3d -+ - 44:67:47:c9:e3:3e -+ - 44:67:47:c9:e3:3f -+ - 44:67:47:c9:e3:40 -+ - 44:67:47:c9:e3:41 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a66 b/hosts/taishan200-2280-2s48p-256g--a66 -index 881f2d6..c7b2083 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a66 -+++ b/hosts/taishan200-2280-2s48p-256g--a66 -@@ -1,12 +1,11 @@ - nr_node: 4 - nr_cpu: 96 --memory: 256G --nr_hdd_partitions: 3 -+memory: 252G -+nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-35000c5009a671773 - - /dev/disk/by-id/scsi-35000c5009a690c53 - - /dev/disk/by-id/scsi-35000c5009a6713fb --rootfs_partition: - - /dev/disk/by-id/scsi-35000c5009a65963f - mac_addr: - - 5c:e8:83:31:c8:8e -diff --git a/hosts/taishan200-2280-2s48p-256g--a67 b/hosts/taishan200-2280-2s48p-256g--a67 -index d23d755..f207003 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a67 -+++ b/hosts/taishan200-2280-2s48p-256g--a67 -@@ -1,12 +1,11 @@ - nr_node: 4 - nr_cpu: 96 --memory: 256G --nr_hdd_partitions: 3 -+memory: 252G -+nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b88aed21 - - /dev/disk/by-id/scsi-350000399b88af325 - - /dev/disk/by-id/scsi-350000399b88af699 --rootfs_partition: - - /dev/disk/by-id/scsi-350000399b88af421 - mac_addr: - - 44:67:47:c9:e2:2c -diff --git a/hosts/taishan200-2280-2s48p-256g--a68 b/hosts/taishan200-2280-2s48p-256g--a68 -index 0ceb191..054105c 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a68 -+++ b/hosts/taishan200-2280-2s48p-256g--a68 -@@ -1,12 +1,11 @@ - nr_node: 4 - nr_cpu: 96 --memory: 256G --nr_hdd_partitions: 3 -+memory: 252G -+nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b8909f81 - - /dev/disk/by-id/scsi-350000399b8909f79 - - /dev/disk/by-id/scsi-350000399b8909605 --rootfs_partition: - - /dev/disk/by-id/scsi-350000399b8909b85 - mac_addr: - - 84:46:fe:89:b6:e6 -diff --git a/hosts/taishan200-2280-2s48p-256g--a69 b/hosts/taishan200-2280-2s48p-256g--a69 -index 5e948ee..e96e34c 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a69 -+++ b/hosts/taishan200-2280-2s48p-256g--a69 -@@ -1,12 +1,11 @@ - nr_node: 4 - nr_cpu: 96 --memory: 256G --nr_hdd_partitions: 3 -+memory: 252G -+nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b88be92d - - /dev/disk/by-id/scsi-350000399b88befc5 - - /dev/disk/by-id/scsi-350000399b88be701 --rootfs_partition: - - /dev/disk/by-id/scsi-350000399b88bea5d - mac_addr: - - 44:67:47:c9:d9:4e -diff --git a/hosts/taishan200-2280-2s48p-256g--a70 b/hosts/taishan200-2280-2s48p-256g--a70 -index 760ce0c..61f99a3 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a70 -+++ b/hosts/taishan200-2280-2s48p-256g--a70 -@@ -1,12 +1,11 @@ - nr_node: 4 - nr_cpu: 96 --memory: 256G --nr_hdd_partitions: 3 -+memory: 252G -+nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b890931d - - /dev/disk/by-id/scsi-350000399b8909d79 - - /dev/disk/by-id/scsi-350000399b8909ac5 --rootfs_partition: - - /dev/disk/by-id/scsi-350000399b8909c99 - mac_addr: - - 84:46:fe:89:b7:22 -diff --git a/hosts/taishan200-2280-2s48p-256g--a71 b/hosts/taishan200-2280-2s48p-256g--a71 -index dde6205..4896475 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a71 -+++ b/hosts/taishan200-2280-2s48p-256g--a71 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 256G -+memory: 252G - mac_addr: - - 44:67:47:d7:6d:e6 - - 44:67:47:d7:6d:e7 -diff --git a/hosts/taishan200-2280-2s64p-256g--a10 b/hosts/taishan200-2280-2s64p-256g--a10 -index 15a9315..a66bff0 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a10 -+++ b/hosts/taishan200-2280-2s64p-256g--a10 -@@ -1,7 +1,11 @@ - nr_node: 4 - nr_cpu: 128 --memory: 256G --rootfs_partition: -+memory: 252G -+nr_hdd_partitions: 1 -+nr_ssd_partitions: 1 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399c8030fd5 -+ssd_partitions: - - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB44333 - mac_addr: - - 44:67:47:86:2c:95 -diff --git a/hosts/taishan200-2280-2s64p-256g--a36 b/hosts/taishan200-2280-2s64p-256g--a36 -new file mode 100644 -index 0000000..d9f1184 ---- /dev/null -+++ b/hosts/taishan200-2280-2s64p-256g--a36 -@@ -0,0 +1,24 @@ -+nr_node: 4 -+nr_cpu: 128 -+memory: 255G -+nr_hdd_partitions: 1 -+nr_ssd_partitions: 1 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-3500003999813487d -+ssd_partitions: -+ - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB42949-part1 -+ - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB42949-part2 -+mac_addr: -+ - 84:46:fe:73:b2:75 -+ - 84:46:fe:73:b2:76 -+ - 84:46:fe:73:b2:77 -+ - 84:46:fe:73:b2:78 -+ - ac:b3:b5:1e:bd:5b -+ - ac:b3:b5:1e:bd:5c -+ - ac:b3:b5:1e:bd:5d -+ - ac:b3:b5:1e:bd:5e -+ - ac:b3:b5:1e:bd:bb -+ - ac:b3:b5:1e:bd:bc -+ - ac:b3:b5:1e:bd:bd -+ - ac:b3:b5:1e:bd:be -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s64p-256g--a40 b/hosts/taishan200-2280-2s64p-256g--a40 -new file mode 100644 -index 0000000..91f5619 ---- /dev/null -+++ b/hosts/taishan200-2280-2s64p-256g--a40 -@@ -0,0 +1,21 @@ -+nr_node: 4 -+nr_cpu: 128 -+memory: 252G -+nr_hdd_partitions: 2 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-3500003999812ed81 -+ - /dev/disk/by-id/scsi-350000399c8020115 -+mac_addr: -+ - 84:46:fe:89:be:8e -+ - 84:46:fe:89:be:8f -+ - 84:46:fe:89:be:90 -+ - 84:46:fe:89:be:91 -+ - ac:b3:b5:1e:d7:3b -+ - ac:b3:b5:1e:d7:3c -+ - ac:b3:b5:1e:d7:3d -+ - ac:b3:b5:1e:d7:3e -+ - ac:b3:b5:1e:d6:cb -+ - ac:b3:b5:1e:d6:cc -+ - ac:b3:b5:1e:d6:cd -+ - ac:b3:b5:1e:d6:ce -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s64p-256g--a41 b/hosts/taishan200-2280-2s64p-256g--a41 -new file mode 100644 -index 0000000..9525cfd ---- /dev/null -+++ b/hosts/taishan200-2280-2s64p-256g--a41 -@@ -0,0 +1,21 @@ -+nr_node: 4 -+nr_cpu: 128 -+memory: 252G -+nr_hdd_partitions: 2 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b8919495 -+ - /dev/disk/by-id/scsi-35000039998130a85 -+mac_addr: -+ - 84:46:fe:89:bc:4a -+ - 84:46:fe:89:bc:4b -+ - 84:46:fe:89:bc:4c -+ - 84:46:fe:89:bc:4d -+ - ac:b3:b5:1e:b6:db -+ - ac:b3:b5:1e:b6:dc -+ - ac:b3:b5:1e:b6:dd -+ - ac:b3:b5:1e:b6:de -+ - ac:b3:b5:1e:b7:5b -+ - ac:b3:b5:1e:b7:5c -+ - ac:b3:b5:1e:b7:5d -+ - ac:b3:b5:1e:b7:5e -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s64p-256g--a42 b/hosts/taishan200-2280-2s64p-256g--a42 -new file mode 100644 -index 0000000..40c1c4b ---- /dev/null -+++ b/hosts/taishan200-2280-2s64p-256g--a42 -@@ -0,0 +1,21 @@ -+nr_node: 4 -+nr_cpu: 128 -+memory: 252G -+nr_hdd_partitions: 2 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b8918a11 -+ - /dev/disk/by-id/scsi-350000399c802ee75 -+mac_addr: -+ - cc:05:77:fe:d8:64 -+ - cc:05:77:fe:d8:65 -+ - cc:05:77:fe:d8:66 -+ - cc:05:77:fe:d8:67 -+ - 44:a1:91:35:6c:50 -+ - 44:a1:91:35:6c:51 -+ - 44:a1:91:35:6c:52 -+ - 44:a1:91:35:6c:53 -+ - 44:a1:91:35:68:d0 -+ - 44:a1:91:35:68:d1 -+ - 44:a1:91:35:68:d2 -+ - 44:a1:91:35:68:d3 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s64p-256g--a9 b/hosts/taishan200-2280-2s64p-256g--a9 -index d6c4353..e360e88 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a9 -+++ b/hosts/taishan200-2280-2s64p-256g--a9 -@@ -1,10 +1,9 @@ - nr_node: 4 - nr_cpu: 128 --memory: 128G --nr_hdd_partitions: 1 -+memory: 126G -+nr_hdd_partitions: 2 - hdd_partitions: - - /dev/disk/by-id/scsi-35000c500bd6a1347 --rootfs_partition: - - /dev/disk/by-id/scsi-35000c500bd62acb3 - mac_addr: - - cc:05:77:fe:d4:0e --- -2.23.0 - diff --git a/hosts/0002-fix-memory-size-and-the-128G-s-host-will-be-added-to.patch b/hosts/0002-fix-memory-size-and-the-128G-s-host-will-be-added-to.patch deleted file mode 100644 index f16c13b..0000000 --- a/hosts/0002-fix-memory-size-and-the-128G-s-host-will-be-added-to.patch +++ /dev/null @@ -1,454 +0,0 @@ -From 5eb020ab8c2591423a1ec55aadf716191ba9b1f3 Mon Sep 17 00:00:00 2001 -From: Zhang Dewan <513619464(a)qq.com> -Date: Sat, 10 Oct 2020 09:44:42 +0800 -Subject: [PATCH lab-z9 2/3] fix memory size, and the 128G's host will be added - to 256G as soon - ---- - hosts/taishan200-2280-2s48p-256g--a13 | 2 +- - hosts/taishan200-2280-2s48p-256g--a14 | 2 +- - hosts/taishan200-2280-2s48p-256g--a15 | 2 +- - hosts/taishan200-2280-2s48p-256g--a17 | 2 +- - hosts/taishan200-2280-2s48p-256g--a18 | 2 +- - hosts/taishan200-2280-2s48p-256g--a19 | 2 +- - hosts/taishan200-2280-2s48p-256g--a21 | 2 +- - hosts/taishan200-2280-2s48p-256g--a22 | 2 +- - hosts/taishan200-2280-2s48p-256g--a24 | 2 +- - hosts/taishan200-2280-2s48p-256g--a25 | 2 +- - hosts/taishan200-2280-2s48p-256g--a26 | 2 +- - hosts/taishan200-2280-2s48p-256g--a27 | 2 +- - hosts/taishan200-2280-2s48p-256g--a28 | 2 +- - hosts/taishan200-2280-2s48p-256g--a29 | 2 +- - hosts/taishan200-2280-2s48p-256g--a30 | 2 +- - hosts/taishan200-2280-2s48p-256g--a31 | 2 +- - hosts/taishan200-2280-2s48p-256g--a32 | 2 +- - hosts/taishan200-2280-2s48p-256g--a33 | 2 +- - hosts/taishan200-2280-2s48p-256g--a34 | 2 +- - hosts/taishan200-2280-2s48p-256g--a52 | 2 +- - hosts/taishan200-2280-2s48p-256g--a53 | 2 +- - hosts/taishan200-2280-2s48p-256g--a60 | 2 +- - hosts/taishan200-2280-2s48p-256g--a61 | 2 +- - hosts/taishan200-2280-2s48p-256g--a62 | 2 +- - hosts/taishan200-2280-2s48p-256g--a66 | 2 +- - hosts/taishan200-2280-2s48p-256g--a67 | 2 +- - hosts/taishan200-2280-2s48p-256g--a68 | 2 +- - hosts/taishan200-2280-2s48p-256g--a69 | 2 +- - hosts/taishan200-2280-2s48p-256g--a70 | 2 +- - hosts/taishan200-2280-2s48p-256g--a71 | 2 +- - hosts/taishan200-2280-2s64p-256g--a10 | 2 +- - hosts/taishan200-2280-2s64p-256g--a40 | 2 +- - hosts/taishan200-2280-2s64p-256g--a41 | 2 +- - hosts/taishan200-2280-2s64p-256g--a42 | 2 +- - 34 files changed, 34 insertions(+), 34 deletions(-) - -diff --git a/hosts/taishan200-2280-2s48p-256g--a13 b/hosts/taishan200-2280-2s48p-256g--a13 -index 1c8f554..fe05233 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a13 -+++ b/hosts/taishan200-2280-2s48p-256g--a13 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - 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 ae84bd5..bd5962b 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a14 -+++ b/hosts/taishan200-2280-2s48p-256g--a14 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - 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 7fa0b67..9b0cd96 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a15 -+++ b/hosts/taishan200-2280-2s48p-256g--a15 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b841fff5 -diff --git a/hosts/taishan200-2280-2s48p-256g--a17 b/hosts/taishan200-2280-2s48p-256g--a17 -index 8be93de..cbbf268 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a17 -+++ b/hosts/taishan200-2280-2s48p-256g--a17 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - 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 e86bdeb..648a1db 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a18 -+++ b/hosts/taishan200-2280-2s48p-256g--a18 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - 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 0c4a60f..2aec477 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a19 -+++ b/hosts/taishan200-2280-2s48p-256g--a19 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - 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 51b7709..9cbb5b5 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a21 -+++ b/hosts/taishan200-2280-2s48p-256g--a21 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - 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 4de0ad0..6af83a7 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a22 -+++ b/hosts/taishan200-2280-2s48p-256g--a22 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - 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 f47947c..dd9b501 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a24 -+++ b/hosts/taishan200-2280-2s48p-256g--a24 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - 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 2f270e8..5d075b9 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a25 -+++ b/hosts/taishan200-2280-2s48p-256g--a25 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - 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 b6de96e..fe395ec 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a26 -+++ b/hosts/taishan200-2280-2s48p-256g--a26 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - 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 b6d9945..63b94f3 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a27 -+++ b/hosts/taishan200-2280-2s48p-256g--a27 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - 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 ecebafc..df048f7 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a28 -+++ b/hosts/taishan200-2280-2s48p-256g--a28 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - 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 bdb13ca..849be55 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a29 -+++ b/hosts/taishan200-2280-2s48p-256g--a29 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - 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 810859b..2be9047 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a30 -+++ b/hosts/taishan200-2280-2s48p-256g--a30 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - 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 8f9d13b..8af7d18 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a31 -+++ b/hosts/taishan200-2280-2s48p-256g--a31 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - 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 66d9b68..fb52e7f 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a32 -+++ b/hosts/taishan200-2280-2s48p-256g--a32 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - 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 ef3b148..4095419 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a33 -+++ b/hosts/taishan200-2280-2s48p-256g--a33 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - 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 528ec82..bae3e58 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a34 -+++ b/hosts/taishan200-2280-2s48p-256g--a34 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b88be219 -diff --git a/hosts/taishan200-2280-2s48p-256g--a52 b/hosts/taishan200-2280-2s48p-256g--a52 -index 4353d4c..654b021 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a52 -+++ b/hosts/taishan200-2280-2s48p-256g--a52 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - 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 0df1cd9..a90b8eb 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a53 -+++ b/hosts/taishan200-2280-2s48p-256g--a53 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 2 - 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 6986a8f..b87d962 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a60 -+++ b/hosts/taishan200-2280-2s48p-256g--a60 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - 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 1c198b8..b33712c 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a61 -+++ b/hosts/taishan200-2280-2s48p-256g--a61 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - 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 26ab646..5c3b04d 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a62 -+++ b/hosts/taishan200-2280-2s48p-256g--a62 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b892d131 -diff --git a/hosts/taishan200-2280-2s48p-256g--a66 b/hosts/taishan200-2280-2s48p-256g--a66 -index c7b2083..88ef791 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a66 -+++ b/hosts/taishan200-2280-2s48p-256g--a66 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - 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 f207003..97ea498 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a67 -+++ b/hosts/taishan200-2280-2s48p-256g--a67 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - 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 054105c..f3d50f4 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a68 -+++ b/hosts/taishan200-2280-2s48p-256g--a68 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - 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 e96e34c..9e5734e 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a69 -+++ b/hosts/taishan200-2280-2s48p-256g--a69 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - 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 61f99a3..0dd8208 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a70 -+++ b/hosts/taishan200-2280-2s48p-256g--a70 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - 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 4896475..dde6205 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a71 -+++ b/hosts/taishan200-2280-2s48p-256g--a71 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - mac_addr: - - 44:67:47:d7:6d:e6 - - 44:67:47:d7:6d:e7 -diff --git a/hosts/taishan200-2280-2s64p-256g--a10 b/hosts/taishan200-2280-2s64p-256g--a10 -index a66bff0..4687d1a 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a10 -+++ b/hosts/taishan200-2280-2s64p-256g--a10 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 128 --memory: 252G -+memory: 256G - nr_hdd_partitions: 1 - nr_ssd_partitions: 1 - hdd_partitions: -diff --git a/hosts/taishan200-2280-2s64p-256g--a40 b/hosts/taishan200-2280-2s64p-256g--a40 -index 91f5619..c0ce550 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a40 -+++ b/hosts/taishan200-2280-2s64p-256g--a40 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 128 --memory: 252G -+memory: 256G - nr_hdd_partitions: 2 - 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 9525cfd..9e01396 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a41 -+++ b/hosts/taishan200-2280-2s64p-256g--a41 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 128 --memory: 252G -+memory: 256G - nr_hdd_partitions: 2 - 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 40c1c4b..1a953df 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a42 -+++ b/hosts/taishan200-2280-2s64p-256g--a42 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 128 --memory: 252G -+memory: 256G - nr_hdd_partitions: 2 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b8918a11 --- -2.23.0 - diff --git a/hosts/0003-hosts-file-add-ipmi_ip.patch b/hosts/0003-hosts-file-add-ipmi_ip.patch deleted file mode 100644 index 5201fc3..0000000 --- a/hosts/0003-hosts-file-add-ipmi_ip.patch +++ /dev/null @@ -1,411 +0,0 @@ -From 02376f205393290c0fef2452decbe23836362204 Mon Sep 17 00:00:00 2001 -From: Zhang Dewan <513619464(a)qq.com> -Date: Tue, 13 Oct 2020 14:49:53 +0800 -Subject: [PATCH lab-z9 3/3] hosts file add ipmi_ip - ---- - hosts/taishan200-2280-2s48p-256g--a11 | 1 + - hosts/taishan200-2280-2s48p-256g--a13 | 1 + - hosts/taishan200-2280-2s48p-256g--a14 | 1 + - hosts/taishan200-2280-2s48p-256g--a15 | 1 + - hosts/taishan200-2280-2s48p-256g--a17 | 1 + - hosts/taishan200-2280-2s48p-256g--a18 | 1 + - hosts/taishan200-2280-2s48p-256g--a19 | 1 + - hosts/taishan200-2280-2s48p-256g--a21 | 1 + - hosts/taishan200-2280-2s48p-256g--a22 | 1 + - hosts/taishan200-2280-2s48p-256g--a24 | 1 + - hosts/taishan200-2280-2s48p-256g--a25 | 1 + - hosts/taishan200-2280-2s48p-256g--a26 | 1 + - hosts/taishan200-2280-2s48p-256g--a27 | 1 + - hosts/taishan200-2280-2s48p-256g--a28 | 1 + - hosts/taishan200-2280-2s48p-256g--a29 | 1 + - hosts/taishan200-2280-2s48p-256g--a30 | 1 + - hosts/taishan200-2280-2s48p-256g--a31 | 1 + - hosts/taishan200-2280-2s48p-256g--a32 | 1 + - hosts/taishan200-2280-2s48p-256g--a33 | 1 + - hosts/taishan200-2280-2s48p-256g--a34 | 1 + - hosts/taishan200-2280-2s48p-256g--a52 | 1 + - hosts/taishan200-2280-2s48p-256g--a53 | 1 + - hosts/taishan200-2280-2s48p-256g--a60 | 1 + - hosts/taishan200-2280-2s48p-256g--a61 | 1 + - hosts/taishan200-2280-2s48p-256g--a62 | 1 + - hosts/taishan200-2280-2s48p-256g--a66 | 1 + - hosts/taishan200-2280-2s48p-256g--a67 | 1 + - hosts/taishan200-2280-2s48p-256g--a68 | 1 + - hosts/taishan200-2280-2s48p-256g--a69 | 1 + - hosts/taishan200-2280-2s48p-256g--a70 | 1 + - hosts/taishan200-2280-2s48p-256g--a71 | 1 + - hosts/taishan200-2280-2s64p-256g--a10 | 1 + - hosts/taishan200-2280-2s64p-256g--a3 | 1 + - hosts/taishan200-2280-2s64p-256g--a36 | 1 + - hosts/taishan200-2280-2s64p-256g--a4 | 1 + - hosts/taishan200-2280-2s64p-256g--a40 | 1 + - hosts/taishan200-2280-2s64p-256g--a41 | 1 + - hosts/taishan200-2280-2s64p-256g--a42 | 1 + - hosts/taishan200-2280-2s64p-256g--a8 | 1 + - hosts/taishan200-2280-2s64p-256g--a9 | 1 + - 40 files changed, 40 insertions(+) - -diff --git a/hosts/taishan200-2280-2s48p-256g--a11 b/hosts/taishan200-2280-2s48p-256g--a11 -index b23cb94..a281e24 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a11 -+++ b/hosts/taishan200-2280-2s48p-256g--a11 -@@ -18,3 +18,4 @@ mac_addr: - - cc:05:77:ab:97:68 - - cc:05:77:ab:97:69 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.5.1 -diff --git a/hosts/taishan200-2280-2s48p-256g--a13 b/hosts/taishan200-2280-2s48p-256g--a13 -index fe05233..78cd2ee 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a13 -+++ b/hosts/taishan200-2280-2s48p-256g--a13 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:97:2b:c5 - - 44:67:47:97:2b:c6 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.5.3 -diff --git a/hosts/taishan200-2280-2s48p-256g--a14 b/hosts/taishan200-2280-2s48p-256g--a14 -index bd5962b..162e687 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a14 -+++ b/hosts/taishan200-2280-2s48p-256g--a14 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:c9:e9:c8 - - 44:67:47:c9:e9:c9 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.5.4 -diff --git a/hosts/taishan200-2280-2s48p-256g--a15 b/hosts/taishan200-2280-2s48p-256g--a15 -index 9b0cd96..3890ff0 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a15 -+++ b/hosts/taishan200-2280-2s48p-256g--a15 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:85:d4:a4 - - 44:67:47:85:d4:a5 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.5.5 -diff --git a/hosts/taishan200-2280-2s48p-256g--a17 b/hosts/taishan200-2280-2s48p-256g--a17 -index cbbf268..f2146f8 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a17 -+++ b/hosts/taishan200-2280-2s48p-256g--a17 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:c9:ea:22 - - 44:67:47:c9:ea:23 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.5.7 -diff --git a/hosts/taishan200-2280-2s48p-256g--a18 b/hosts/taishan200-2280-2s48p-256g--a18 -index 648a1db..e0ca747 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a18 -+++ b/hosts/taishan200-2280-2s48p-256g--a18 -@@ -17,3 +17,4 @@ mac_addr: - - 84:46:fe:3d:a7:ef - - 84:46:fe:3d:a7:f0 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.5.8 -diff --git a/hosts/taishan200-2280-2s48p-256g--a19 b/hosts/taishan200-2280-2s48p-256g--a19 -index 2aec477..2b3c440 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a19 -+++ b/hosts/taishan200-2280-2s48p-256g--a19 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:85:d5:4e - - 44:67:47:85:d5:4f - model_name: Kunpeng-920 -+ipmi_ip: 9.3.5.9 -diff --git a/hosts/taishan200-2280-2s48p-256g--a21 b/hosts/taishan200-2280-2s48p-256g--a21 -index 9cbb5b5..44c4e64 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a21 -+++ b/hosts/taishan200-2280-2s48p-256g--a21 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:86:1b:e6 - - 44:67:47:86:1b:e7 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.5.11 -diff --git a/hosts/taishan200-2280-2s48p-256g--a22 b/hosts/taishan200-2280-2s48p-256g--a22 -index 6af83a7..b6d10af 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a22 -+++ b/hosts/taishan200-2280-2s48p-256g--a22 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:d7:6d:1a - - 44:67:47:d7:6d:1b - model_name: Kunpeng-920 -+ipmi_ip: 9.3.5.12 -diff --git a/hosts/taishan200-2280-2s48p-256g--a24 b/hosts/taishan200-2280-2s48p-256g--a24 -index dd9b501..5e1571d 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a24 -+++ b/hosts/taishan200-2280-2s48p-256g--a24 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:c9:d8:fa - - 44:67:47:c9:d8:fb - model_name: Kunpeng-920 -+ipmi_ip: 9.3.9.1 -diff --git a/hosts/taishan200-2280-2s48p-256g--a25 b/hosts/taishan200-2280-2s48p-256g--a25 -index 5d075b9..1f3f599 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a25 -+++ b/hosts/taishan200-2280-2s48p-256g--a25 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:c9:ea:0e - - 44:67:47:c9:ea:0f - model_name: Kunpeng-920 -+ipmi_ip: 9.3.9.2 -diff --git a/hosts/taishan200-2280-2s48p-256g--a26 b/hosts/taishan200-2280-2s48p-256g--a26 -index fe395ec..b136009 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a26 -+++ b/hosts/taishan200-2280-2s48p-256g--a26 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:c9:e9:46 - - 44:67:47:c9:e9:47 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.9.3 -diff --git a/hosts/taishan200-2280-2s48p-256g--a27 b/hosts/taishan200-2280-2s48p-256g--a27 -index 63b94f3..96a387d 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a27 -+++ b/hosts/taishan200-2280-2s48p-256g--a27 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:d7:6d:42 - - 44:67:47:d7:6d:43 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.9.4 -diff --git a/hosts/taishan200-2280-2s48p-256g--a28 b/hosts/taishan200-2280-2s48p-256g--a28 -index df048f7..5a4f298 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a28 -+++ b/hosts/taishan200-2280-2s48p-256g--a28 -@@ -17,3 +17,4 @@ mac_addr: - - 5c:e8:83:31:c8:26 - - 5c:e8:83:31:c8:27 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.9.5 -diff --git a/hosts/taishan200-2280-2s48p-256g--a29 b/hosts/taishan200-2280-2s48p-256g--a29 -index 849be55..5b7c0b8 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a29 -+++ b/hosts/taishan200-2280-2s48p-256g--a29 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:c9:d8:f0 - - 44:67:47:c9:d8:f1 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.9.6 -diff --git a/hosts/taishan200-2280-2s48p-256g--a30 b/hosts/taishan200-2280-2s48p-256g--a30 -index 2be9047..2c8d2d3 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a30 -+++ b/hosts/taishan200-2280-2s48p-256g--a30 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:86:1b:d2 - - 44:67:47:86:1b:d3 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.9.7 -diff --git a/hosts/taishan200-2280-2s48p-256g--a31 b/hosts/taishan200-2280-2s48p-256g--a31 -index 8af7d18..9aec903 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a31 -+++ b/hosts/taishan200-2280-2s48p-256g--a31 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:86:1b:b4 - - 44:67:47:86:1b:b5 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.9.8 -diff --git a/hosts/taishan200-2280-2s48p-256g--a32 b/hosts/taishan200-2280-2s48p-256g--a32 -index fb52e7f..d677838 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a32 -+++ b/hosts/taishan200-2280-2s48p-256g--a32 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:c9:db:3e - - 44:67:47:c9:db:3f - model_name: Kunpeng-920 -+ipmi_ip: 9.3.9.9 -diff --git a/hosts/taishan200-2280-2s48p-256g--a33 b/hosts/taishan200-2280-2s48p-256g--a33 -index 4095419..d4df847 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a33 -+++ b/hosts/taishan200-2280-2s48p-256g--a33 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:d7:6c:ca - - 44:67:47:d7:6c:cb - model_name: Kunpeng-920 -+ipmi_ip: 9.3.9.10 -diff --git a/hosts/taishan200-2280-2s48p-256g--a34 b/hosts/taishan200-2280-2s48p-256g--a34 -index bae3e58..680cb6f 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a34 -+++ b/hosts/taishan200-2280-2s48p-256g--a34 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:c9:d9:2c - - 44:67:47:c9:d9:2d - model_name: Kunpeng-920 -+ipmi_ip: 9.3.9.11 -diff --git a/hosts/taishan200-2280-2s48p-256g--a52 b/hosts/taishan200-2280-2s48p-256g--a52 -index 654b021..a64cdec 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a52 -+++ b/hosts/taishan200-2280-2s48p-256g--a52 -@@ -17,3 +17,4 @@ mac_addr: - - 5c:e8:83:31:c8:da - - 5c:e8:83:31:c8:db - model_name: Kunpeng-920 -+ipmi_ip: 9.3.3.5 -diff --git a/hosts/taishan200-2280-2s48p-256g--a53 b/hosts/taishan200-2280-2s48p-256g--a53 -index a90b8eb..148e747 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a53 -+++ b/hosts/taishan200-2280-2s48p-256g--a53 -@@ -15,3 +15,4 @@ mac_addr: - - 5c:e8:83:73:25:cf - - 5c:e8:83:73:25:d0 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.3.6 -diff --git a/hosts/taishan200-2280-2s48p-256g--a60 b/hosts/taishan200-2280-2s48p-256g--a60 -index b87d962..9e969b0 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a60 -+++ b/hosts/taishan200-2280-2s48p-256g--a60 -@@ -17,3 +17,4 @@ mac_addr: - - e0:00:84:2b:51:83 - - e0:00:84:2b:51:84 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.4.1 -diff --git a/hosts/taishan200-2280-2s48p-256g--a61 b/hosts/taishan200-2280-2s48p-256g--a61 -index b33712c..2992c6f 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a61 -+++ b/hosts/taishan200-2280-2s48p-256g--a61 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:c9:e4:be - - 44:67:47:c9:e4:bf - model_name: Kunpeng-920 -+ipmi_ip: 9.3.4.2 -diff --git a/hosts/taishan200-2280-2s48p-256g--a62 b/hosts/taishan200-2280-2s48p-256g--a62 -index 5c3b04d..5262637 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a62 -+++ b/hosts/taishan200-2280-2s48p-256g--a62 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:c9:e3:40 - - 44:67:47:c9:e3:41 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.4.3 -diff --git a/hosts/taishan200-2280-2s48p-256g--a66 b/hosts/taishan200-2280-2s48p-256g--a66 -index 88ef791..b7a3715 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a66 -+++ b/hosts/taishan200-2280-2s48p-256g--a66 -@@ -17,3 +17,4 @@ mac_addr: - - 5c:e8:83:31:c8:94 - - 5c:e8:83:31:c8:95 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.4.7 -diff --git a/hosts/taishan200-2280-2s48p-256g--a67 b/hosts/taishan200-2280-2s48p-256g--a67 -index 97ea498..2501f6e 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a67 -+++ b/hosts/taishan200-2280-2s48p-256g--a67 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:c9:e2:32 - - 44:67:47:c9:e2:33 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.4.8 -diff --git a/hosts/taishan200-2280-2s48p-256g--a68 b/hosts/taishan200-2280-2s48p-256g--a68 -index f3d50f4..c51e348 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a68 -+++ b/hosts/taishan200-2280-2s48p-256g--a68 -@@ -17,3 +17,4 @@ mac_addr: - - 84:46:fe:89:b6:ec - - 84:46:fe:89:b6:ed - model_name: Kunpeng-920 -+ipmi_ip: 9.3.4.9 -diff --git a/hosts/taishan200-2280-2s48p-256g--a69 b/hosts/taishan200-2280-2s48p-256g--a69 -index 9e5734e..964f79e 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a69 -+++ b/hosts/taishan200-2280-2s48p-256g--a69 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:c9:d9:54 - - 44:67:47:c9:d9:55 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.4.10 -diff --git a/hosts/taishan200-2280-2s48p-256g--a70 b/hosts/taishan200-2280-2s48p-256g--a70 -index 0dd8208..2424a9f 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a70 -+++ b/hosts/taishan200-2280-2s48p-256g--a70 -@@ -17,3 +17,4 @@ mac_addr: - - 84:46:fe:89:b7:28 - - 84:46:fe:89:b7:29 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.4.11 -diff --git a/hosts/taishan200-2280-2s48p-256g--a71 b/hosts/taishan200-2280-2s48p-256g--a71 -index dde6205..501ea4b 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a71 -+++ b/hosts/taishan200-2280-2s48p-256g--a71 -@@ -11,3 +11,4 @@ mac_addr: - - 44:67:47:d7:6d:ec - - 44:67:47:d7:6d:ed - model_name: Kunpeng-920 -+ipmi_ip: 9.3.4.12 -diff --git a/hosts/taishan200-2280-2s64p-256g--a10 b/hosts/taishan200-2280-2s64p-256g--a10 -index 4687d1a..fcc6c63 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a10 -+++ b/hosts/taishan200-2280-2s64p-256g--a10 -@@ -21,3 +21,4 @@ mac_addr: - - ac:b3:b5:1e:d5:4d - - ac:b3:b5:1e:d5:4e - model_name: Kunpeng-920 -+ipmi_ip: 9.3.1.10 -diff --git a/hosts/taishan200-2280-2s64p-256g--a3 b/hosts/taishan200-2280-2s64p-256g--a3 -index 1bdadca..744978e 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a3 -+++ b/hosts/taishan200-2280-2s64p-256g--a3 -@@ -22,3 +22,4 @@ mac_addr: - - ac:b3:b5:1f:74:f0 - - ac:b3:b5:1f:74:f1 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.1.3 -diff --git a/hosts/taishan200-2280-2s64p-256g--a36 b/hosts/taishan200-2280-2s64p-256g--a36 -index d9f1184..e04bc3a 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a36 -+++ b/hosts/taishan200-2280-2s64p-256g--a36 -@@ -22,3 +22,4 @@ mac_addr: - - ac:b3:b5:1e:bd:bd - - ac:b3:b5:1e:bd:be - model_name: Kunpeng-920 -+ipmi_ip: 9.3.2.1 -diff --git a/hosts/taishan200-2280-2s64p-256g--a4 b/hosts/taishan200-2280-2s64p-256g--a4 -index 8ef481c..0f73c52 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a4 -+++ b/hosts/taishan200-2280-2s64p-256g--a4 -@@ -22,3 +22,4 @@ mac_addr: - - ac:b3:b5:1f:7d:50 - - ac:b3:b5:1f:7d:51 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.1.4 -diff --git a/hosts/taishan200-2280-2s64p-256g--a40 b/hosts/taishan200-2280-2s64p-256g--a40 -index c0ce550..3172475 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a40 -+++ b/hosts/taishan200-2280-2s64p-256g--a40 -@@ -19,3 +19,4 @@ mac_addr: - - ac:b3:b5:1e:d6:cd - - ac:b3:b5:1e:d6:ce - model_name: Kunpeng-920 -+ipmi_ip: 9.3.2.5 -diff --git a/hosts/taishan200-2280-2s64p-256g--a41 b/hosts/taishan200-2280-2s64p-256g--a41 -index 9e01396..4253e1f 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a41 -+++ b/hosts/taishan200-2280-2s64p-256g--a41 -@@ -19,3 +19,4 @@ mac_addr: - - ac:b3:b5:1e:b7:5d - - ac:b3:b5:1e:b7:5e - model_name: Kunpeng-920 -+ipmi_ip: 9.3.2.6 -diff --git a/hosts/taishan200-2280-2s64p-256g--a42 b/hosts/taishan200-2280-2s64p-256g--a42 -index 1a953df..dce3cf0 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a42 -+++ b/hosts/taishan200-2280-2s64p-256g--a42 -@@ -19,3 +19,4 @@ mac_addr: - - 44:a1:91:35:68:d2 - - 44:a1:91:35:68:d3 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.2.7 -diff --git a/hosts/taishan200-2280-2s64p-256g--a8 b/hosts/taishan200-2280-2s64p-256g--a8 -index fd22672..64f2750 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a8 -+++ b/hosts/taishan200-2280-2s64p-256g--a8 -@@ -13,3 +13,4 @@ mac_addr: - - ac:b3:b5:1e:b6:7d - - ac:b3:b5:1e:b6:7e - model_name: Kunpeng-920 -+ipmi_ip: 9.3.1.8 -diff --git a/hosts/taishan200-2280-2s64p-256g--a9 b/hosts/taishan200-2280-2s64p-256g--a9 -index e360e88..f977a7c 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a9 -+++ b/hosts/taishan200-2280-2s64p-256g--a9 -@@ -15,3 +15,4 @@ mac_addr: - - 44:a1:91:35:1a:72 - - 44:a1:91:35:1a:73 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.1.9 --- -2.23.0 - diff --git a/hosts/m b/hosts/m new file mode 100644 index 0000000..ae2c84f --- /dev/null +++ b/hosts/m @@ -0,0 +1,37 @@ +taishan200-2280-2s48p-256g--a13 a13 +taishan200-2280-2s48p-256g--a14 a14 +taishan200-2280-2s48p-256g--a15 a15 +taishan200-2280-2s48p-256g--a17 a17 +taishan200-2280-2s48p-256g--a18 a18 +taishan200-2280-2s48p-256g--a19 a19 +taishan200-2280-2s48p-256g--a21 a21 +taishan200-2280-2s48p-256g--a22 a22 +taishan200-2280-2s48p-256g--a24 a24 +taishan200-2280-2s48p-256g--a25 a25 +taishan200-2280-2s48p-256g--a26 a26 +taishan200-2280-2s48p-256g--a27 a27 +taishan200-2280-2s48p-256g--a28 a28 +taishan200-2280-2s48p-256g--a29 a29 +taishan200-2280-2s48p-256g--a30 a30 +taishan200-2280-2s48p-256g--a31 a31 +taishan200-2280-2s48p-256g--a32 a32 +taishan200-2280-2s48p-256g--a33 a33 +taishan200-2280-2s48p-256g--a34 a34 +taishan200-2280-2s48p-256g--a35 a35 +taishan200-2280-2s48p-256g--a52 a52 +taishan200-2280-2s48p-256g--a53 a53 +taishan200-2280-2s48p-256g--a60 a60 +taishan200-2280-2s48p-256g--a61 a61 +taishan200-2280-2s48p-256g--a62 a62 +taishan200-2280-2s48p-256g--a66 a66 +taishan200-2280-2s48p-256g--a67 a67 +taishan200-2280-2s48p-256g--a68 a68 +taishan200-2280-2s48p-256g--a69 a69 +taishan200-2280-2s48p-256g--a70 a70 +taishan200-2280-2s48p-256g--a71 a71 +taishan200-2280-2s64p-256g--a10 a10 +taishan200-2280-2s64p-256g--a36 a36 +taishan200-2280-2s64p-256g--a40 a40 +taishan200-2280-2s64p-256g--a41 a41 +taishan200-2280-2s64p-256g--a42 a42 +taishan200-2280-2s64p-256g--a9 a9 diff --git a/hosts/p b/hosts/p new file mode 100644 index 0000000..9d47282 --- /dev/null +++ b/hosts/p @@ -0,0 +1,10 @@ +#!/bin/bash + +while read line +do + + i=$(echo $line | awk '{print $2}') + j=$(echo $line | awk '{print $1}') + ip=$(grep $i /home/dewan/servers.info | head -n 1 |awk '{print $1}') + echo "ipmi_ip: $ip" >> $j +done < m diff --git a/hosts/taishan200-2280-2s48p-256g--a11 b/hosts/taishan200-2280-2s48p-256g--a11 deleted file mode 100644 index b23cb94..0000000 --- a/hosts/taishan200-2280-2s48p-256g--a11 +++ /dev/null @@ -1,20 +0,0 @@ -nr_node: 4 -nr_cpu: 96 -memory: 256G -nr_hdd_partitions: 3 -hdd_partitions: - - /dev/disk/by-id/scsi-350000399b8891431-part1 - - /dev/disk/by-id/scsi-350000399b8890e09 - - /dev/disk/by-id/scsi-350000399b8890cd1 -rootfs_partition: - - /dev/disk/by-id/scsi-350000399b8727929 -mac_addr: - - cc:05:77:ab:97:62 - - cc:05:77:ab:97:63 - - cc:05:77:ab:97:64 - - cc:05:77:ab:97:65 - - cc:05:77:ab:97:66 - - cc:05:77:ab:97:67 - - cc:05:77:ab:97:68 - - cc:05:77:ab:97:69 -model_name: Kunpeng-920 diff --git a/hosts/taishan200-2280-2s48p-256g--a13 b/hosts/taishan200-2280-2s48p-256g--a13 new file mode 100644 index 0000000..7fca8ed --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a13 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-35000c500c2799bb3 + - /dev/disk/by-id/scsi-35000c500c278b18b + - /dev/disk/by-id/scsi-35000c500c279f96b + - /dev/disk/by-id/scsi-35000c500c2789b4b +mac_addr: + - 44:67:47:97:2b:bf + - 44:67:47:97:2b:c0 + - 44:67:47:97:2b:c1 + - 44:67:47:97:2b:c2 + - 44:67:47:97:2b:c3 + - 44:67:47:97:2b:c4 + - 44:67:47:97:2b:c5 + - 44:67:47:97:2b:c6 +model_name: Kunpeng-920 +ipmi_ip: 9.3.5.3 diff --git a/hosts/taishan200-2280-2s48p-256g--a14 b/hosts/taishan200-2280-2s48p-256g--a14 new file mode 100644 index 0000000..7134e6c --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a14 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88b4475 + - /dev/disk/by-id/scsi-350000399b88b4371 + - /dev/disk/by-id/scsi-350000399b88b432d + - /dev/disk/by-id/scsi-350000399b88b4531 +mac_addr: + - 44:67:47:c9:e9:c2 + - 44:67:47:c9:e9:c3 + - 44:67:47:c9:e9:c4 + - 44:67:47:c9:e9:c5 + - 44:67:47:c9:e9:c6 + - 44:67:47:c9:e9:c7 + - 44:67:47:c9:e9:c8 + - 44:67:47:c9:e9:c9 +model_name: Kunpeng-920 +ipmi_ip: 9.3.5.4 diff --git a/hosts/taishan200-2280-2s48p-256g--a15 b/hosts/taishan200-2280-2s48p-256g--a15 new file mode 100644 index 0000000..5eb756c --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a15 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b841fff5 + - /dev/disk/by-id/scsi-350000399b841fcb9 + - /dev/disk/by-id/scsi-350000399b8420a0d + - /dev/disk/by-id/scsi-350000399b841ff55 +mac_addr: + - 44:67:47:85:d4:9e + - 44:67:47:85:d4:9f + - 44:67:47:85:d4:a0 + - 44:67:47:85:d4:a1 + - 44:67:47:85:d4:a2 + - 44:67:47:85:d4:a3 + - 44:67:47:85:d4:a4 + - 44:67:47:85:d4:a5 +model_name: Kunpeng-920 +ipmi_ip: 9.3.5.5 diff --git a/hosts/taishan200-2280-2s48p-256g--a17 b/hosts/taishan200-2280-2s48p-256g--a17 new file mode 100644 index 0000000..e3168bf --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a17 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88b44cd + - /dev/disk/by-id/scsi-350000399b88b4541 + - /dev/disk/by-id/scsi-350000399b88b4495 + - /dev/disk/by-id/scsi-350000399b88b48d1 +mac_addr: + - 44:67:47:c9:ea:1c + - 44:67:47:c9:ea:1d + - 44:67:47:c9:ea:1e + - 44:67:47:c9:ea:1f + - 44:67:47:c9:ea:20 + - 44:67:47:c9:ea:21 + - 44:67:47:c9:ea:22 + - 44:67:47:c9:ea:23 +model_name: Kunpeng-920 +ipmi_ip: 9.3.5.7 diff --git a/hosts/taishan200-2280-2s48p-256g--a18 b/hosts/taishan200-2280-2s48p-256g--a18 new file mode 100644 index 0000000..12b6f71 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a18 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b891b4d1 + - /dev/disk/by-id/scsi-350000399b8890d59 + - /dev/disk/by-id/scsi-350000399b8890f65 + - /dev/disk/by-id/scsi-350000399b891b3c5 +mac_addr: + - 84:46:fe:3d:a7:e9 + - 84:46:fe:3d:a7:ea + - 84:46:fe:3d:a7:eb + - 84:46:fe:3d:a7:ec + - 84:46:fe:3d:a7:ed + - 84:46:fe:3d:a7:ee + - 84:46:fe:3d:a7:ef + - 84:46:fe:3d:a7:f0 +model_name: Kunpeng-920 +ipmi_ip: 9.3.5.8 diff --git a/hosts/taishan200-2280-2s48p-256g--a19 b/hosts/taishan200-2280-2s48p-256g--a19 new file mode 100644 index 0000000..a1541c4 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a19 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8923939 + - /dev/disk/by-id/scsi-350000399b8420b2d + - /dev/disk/by-id/scsi-350000399b891b5c5 + - /dev/disk/by-id/scsi-350000399b841f769 +mac_addr: + - 44:67:47:85:d5:48 + - 44:67:47:85:d5:49 + - 44:67:47:85:d5:4a + - 44:67:47:85:d5:4b + - 44:67:47:85:d5:4c + - 44:67:47:85:d5:4d + - 44:67:47:85:d5:4e + - 44:67:47:85:d5:4f +model_name: Kunpeng-920 +ipmi_ip: 9.3.5.9 diff --git a/hosts/taishan200-2280-2s48p-256g--a21 b/hosts/taishan200-2280-2s48p-256g--a21 new file mode 100644 index 0000000..4dea3c8 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a21 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88bf2d5 + - /dev/disk/by-id/scsi-350000399b88bf5a5 + - /dev/disk/by-id/scsi-350000399b88bf279 + - /dev/disk/by-id/scsi-350000399b88bf24d +mac_addr: + - 44:67:47:86:1b:e0 + - 44:67:47:86:1b:e1 + - 44:67:47:86:1b:e2 + - 44:67:47:86:1b:e3 + - 44:67:47:86:1b:e4 + - 44:67:47:86:1b:e5 + - 44:67:47:86:1b:e6 + - 44:67:47:86:1b:e7 +model_name: Kunpeng-920 +ipmi_ip: 9.3.5.11 diff --git a/hosts/taishan200-2280-2s48p-256g--a22 b/hosts/taishan200-2280-2s48p-256g--a22 new file mode 100644 index 0000000..4fabb6f --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a22 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8919069 + - /dev/disk/by-id/scsi-350000399b8918c15 + - /dev/disk/by-id/scsi-350000399b8918c79 + - /dev/disk/by-id/scsi-350000399b8918cb9 +mac_addr: + - 44:67:47:d7:6d:14 + - 44:67:47:d7:6d:15 + - 44:67:47:d7:6d:16 + - 44:67:47:d7:6d:17 + - 44:67:47:d7:6d:18 + - 44:67:47:d7:6d:19 + - 44:67:47:d7:6d:1a + - 44:67:47:d7:6d:1b +model_name: Kunpeng-920 +ipmi_ip: 9.3.5.12 diff --git a/hosts/taishan200-2280-2s48p-256g--a24 b/hosts/taishan200-2280-2s48p-256g--a24 index f46bfab..64e1f6f 100644 --- a/hosts/taishan200-2280-2s48p-256g--a24 +++ b/hosts/taishan200-2280-2s48p-256g--a24 @@ -1,12 +1,11 @@ nr_node: 4 nr_cpu: 96 -memory: 256G -nr_hdd_partitions: 3 +memory: 252G +nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8917d59 - - /dev/disk/by-id/scsi-350000399b891790d - /dev/disk/by-id/scsi-350000399b89185d9 -rootfs_partition: + - /dev/disk/by-id/scsi-350000399b891790d - /dev/disk/by-id/scsi-350000399b8917ef1 mac_addr: - 44:67:47:c9:d8:f4 @@ -18,3 +17,4 @@ mac_addr: - 44:67:47:c9:d8:fa - 44:67:47:c9:d8:fb model_name: Kunpeng-920 +ipmi_ip: 9.3.9.1 diff --git a/hosts/taishan200-2280-2s48p-256g--a25 b/hosts/taishan200-2280-2s48p-256g--a25 index ee5eeb3..4dfb257 100644 --- a/hosts/taishan200-2280-2s48p-256g--a25 +++ b/hosts/taishan200-2280-2s48p-256g--a25 @@ -1,12 +1,11 @@ nr_node: 4 nr_cpu: 96 -memory: 256G -nr_hdd_partitions: 3 +memory: 252G +nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88b4499 - /dev/disk/by-id/scsi-350000399b88b4455 - /dev/disk/by-id/scsi-350000399b88b442d -rootfs_partition: - /dev/disk/by-id/scsi-350000399b88b44f9 mac_addr: - 44:67:47:c9:ea:08 @@ -18,3 +17,4 @@ mac_addr: - 44:67:47:c9:ea:0e - 44:67:47:c9:ea:0f model_name: Kunpeng-920 +ipmi_ip: 9.3.9.2 diff --git a/hosts/taishan200-2280-2s48p-256g--a26 b/hosts/taishan200-2280-2s48p-256g--a26 new file mode 100644 index 0000000..9ecfeee --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a26 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88bf131 + - /dev/disk/by-id/scsi-350000399b88bfd8d + - /dev/disk/by-id/scsi-350000399b88bfe55 + - /dev/disk/by-id/scsi-350000399b88bef31 +mac_addr: + - 44:67:47:c9:e9:40 + - 44:67:47:c9:e9:41 + - 44:67:47:c9:e9:42 + - 44:67:47:c9:e9:43 + - 44:67:47:c9:e9:44 + - 44:67:47:c9:e9:45 + - 44:67:47:c9:e9:46 + - 44:67:47:c9:e9:47 +model_name: Kunpeng-920 +ipmi_ip: 9.3.9.3 diff --git a/hosts/taishan200-2280-2s48p-256g--a27 b/hosts/taishan200-2280-2s48p-256g--a27 new file mode 100644 index 0000000..a529631 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a27 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8918ea9 + - /dev/disk/by-id/scsi-350000399b8918bad + - /dev/disk/by-id/scsi-350000399b8918d05 + - /dev/disk/by-id/scsi-350000399b8919415 +mac_addr: + - 44:67:47:d7:6d:3c + - 44:67:47:d7:6d:3d + - 44:67:47:d7:6d:3e + - 44:67:47:d7:6d:3f + - 44:67:47:d7:6d:40 + - 44:67:47:d7:6d:41 + - 44:67:47:d7:6d:42 + - 44:67:47:d7:6d:43 +model_name: Kunpeng-920 +ipmi_ip: 9.3.9.4 diff --git a/hosts/taishan200-2280-2s48p-256g--a28 b/hosts/taishan200-2280-2s48p-256g--a28 new file mode 100644 index 0000000..8682c85 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a28 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-35000c500cdf1eb07 + - /dev/disk/by-id/scsi-35000c500cdef4c6f + - /dev/disk/by-id/scsi-35000c500cdefac2b + - /dev/disk/by-id/scsi-35000c500cdefa75f +mac_addr: + - 5c:e8:83:31:c8:20 + - 5c:e8:83:31:c8:21 + - 5c:e8:83:31:c8:22 + - 5c:e8:83:31:c8:23 + - 5c:e8:83:31:c8:24 + - 5c:e8:83:31:c8:25 + - 5c:e8:83:31:c8:26 + - 5c:e8:83:31:c8:27 +model_name: Kunpeng-920 +ipmi_ip: 9.3.9.5 diff --git a/hosts/taishan200-2280-2s48p-256g--a29 b/hosts/taishan200-2280-2s48p-256g--a29 new file mode 100644 index 0000000..ec17c19 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a29 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8918425 + - /dev/disk/by-id/scsi-350000399b891841d + - /dev/disk/by-id/scsi-350000399b8917859 + - /dev/disk/by-id/scsi-350000399b8917a51 +mac_addr: + - 44:67:47:c9:d8:ea + - 44:67:47:c9:d8:eb + - 44:67:47:c9:d8:ec + - 44:67:47:c9:d8:ed + - 44:67:47:c9:d8:ee + - 44:67:47:c9:d8:ef + - 44:67:47:c9:d8:f0 + - 44:67:47:c9:d8:f1 +model_name: Kunpeng-920 +ipmi_ip: 9.3.9.6 diff --git a/hosts/taishan200-2280-2s48p-256g--a30 b/hosts/taishan200-2280-2s48p-256g--a30 new file mode 100644 index 0000000..41e1083 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a30 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b883b881 + - /dev/disk/by-id/scsi-350000399b88bf83d + - /dev/disk/by-id/scsi-350000399b883bbbd + - /dev/disk/by-id/scsi-350000399b88bf48d +mac_addr: + - 44:67:47:86:1b:cc + - 44:67:47:86:1b:cd + - 44:67:47:86:1b:ce + - 44:67:47:86:1b:cf + - 44:67:47:86:1b:d0 + - 44:67:47:86:1b:d1 + - 44:67:47:86:1b:d2 + - 44:67:47:86:1b:d3 +model_name: Kunpeng-920 +ipmi_ip: 9.3.9.7 diff --git a/hosts/taishan200-2280-2s48p-256g--a31 b/hosts/taishan200-2280-2s48p-256g--a31 new file mode 100644 index 0000000..80abe0e --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a31 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b883b929 + - /dev/disk/by-id/scsi-350000399b883bbe1 + - /dev/disk/by-id/scsi-350000399b883c059 + - /dev/disk/by-id/scsi-350000399b883bc9d +mac_addr: + - 44:67:47:86:1b:ae + - 44:67:47:86:1b:af + - 44:67:47:86:1b:b0 + - 44:67:47:86:1b:b1 + - 44:67:47:86:1b:b2 + - 44:67:47:86:1b:b3 + - 44:67:47:86:1b:b4 + - 44:67:47:86:1b:b5 +model_name: Kunpeng-920 +ipmi_ip: 9.3.9.8 diff --git a/hosts/taishan200-2280-2s48p-256g--a32 b/hosts/taishan200-2280-2s48p-256g--a32 new file mode 100644 index 0000000..3719131 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a32 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88bf141 + - /dev/disk/by-id/scsi-350000399b88bee25 + - /dev/disk/by-id/scsi-350000399b88bea59 + - /dev/disk/by-id/scsi-350000399b88be1d9 +mac_addr: + - 44:67:47:c9:db:38 + - 44:67:47:c9:db:39 + - 44:67:47:c9:db:3a + - 44:67:47:c9:db:3b + - 44:67:47:c9:db:3c + - 44:67:47:c9:db:3d + - 44:67:47:c9:db:3e + - 44:67:47:c9:db:3f +model_name: Kunpeng-920 +ipmi_ip: 9.3.9.9 diff --git a/hosts/taishan200-2280-2s48p-256g--a33 b/hosts/taishan200-2280-2s48p-256g--a33 new file mode 100644 index 0000000..13af4dc --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a33 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8919555 + - /dev/disk/by-id/scsi-350000399b8918c4d + - /dev/disk/by-id/scsi-350000399b8919c3d + - /dev/disk/by-id/scsi-350000399b8919389 +mac_addr: + - 44:67:47:d7:6c:c4 + - 44:67:47:d7:6c:c5 + - 44:67:47:d7:6c:c6 + - 44:67:47:d7:6c:c7 + - 44:67:47:d7:6c:c8 + - 44:67:47:d7:6c:c9 + - 44:67:47:d7:6c:ca + - 44:67:47:d7:6c:cb +model_name: Kunpeng-920 +ipmi_ip: 9.3.9.10 diff --git a/hosts/taishan200-2280-2s48p-256g--a34 b/hosts/taishan200-2280-2s48p-256g--a34 new file mode 100644 index 0000000..b0a1e8a --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a34 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88be219 + - /dev/disk/by-id/scsi-350000399b88bdf71 + - /dev/disk/by-id/scsi-350000399b88bdb49 + - /dev/disk/by-id/scsi-350000399b891784d +mac_addr: + - 44:67:47:c9:d9:26 + - 44:67:47:c9:d9:27 + - 44:67:47:c9:d9:28 + - 44:67:47:c9:d9:29 + - 44:67:47:c9:d9:2a + - 44:67:47:c9:d9:2b + - 44:67:47:c9:d9:2c + - 44:67:47:c9:d9:2d +model_name: Kunpeng-920 +ipmi_ip: 9.3.9.11 diff --git a/hosts/taishan200-2280-2s48p-256g--a35 b/hosts/taishan200-2280-2s48p-256g--a35 new file mode 100644 index 0000000..ec1e524 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a35 @@ -0,0 +1,21 @@ +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399886a71a5 + - /dev/disk/by-id/scsi-350000399886b66dd-part1 + - /dev/disk/by-id/scsi-350000399886b66dd-part2 + - /dev/disk/by-id/scsi-350000399886b66dd-part3 + - /dev/disk/by-id/scsi-362c97b1c6eedb00026e527a2b8b998f2 +mac_addr: + - 44:67:47:c9:ec:ec + - 44:67:47:c9:ec:ed + - 44:67:47:c9:ec:ee + - 44:67:47:c9:ec:ef + - 44:67:47:c9:ec:f0 + - 44:67:47:c9:ec:f1 + - 44:67:47:c9:ec:f2 + - 44:67:47:c9:ec:f3 +model_name: Kunpeng-920 +ipmi_ip: 9.3.9.12 diff --git a/hosts/taishan200-2280-2s48p-256g--a52 b/hosts/taishan200-2280-2s48p-256g--a52 new file mode 100644 index 0000000..a3ea181 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a52 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-35000c500cdefd89b + - /dev/disk/by-id/scsi-35000c500cdefac67 + - /dev/disk/by-id/scsi-35000c500cdedee6f + - /dev/disk/by-id/scsi-35000c500cdedfdaf +mac_addr: + - 5c:e8:83:31:c8:d4 + - 5c:e8:83:31:c8:d5 + - 5c:e8:83:31:c8:d6 + - 5c:e8:83:31:c8:d7 + - 5c:e8:83:31:c8:d8 + - 5c:e8:83:31:c8:d9 + - 5c:e8:83:31:c8:da + - 5c:e8:83:31:c8:db +model_name: Kunpeng-920 +ipmi_ip: 9.3.3.5 diff --git a/hosts/taishan200-2280-2s48p-256g--a53 b/hosts/taishan200-2280-2s48p-256g--a53 new file mode 100644 index 0000000..5d97218 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a53 @@ -0,0 +1,18 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 2 +hdd_partitions: + - /dev/disk/by-id/scsi-35000c500bd6aa4e3 + - /dev/disk/by-id/scsi-35000c500bd681acf +mac_addr: + - 5c:e8:83:73:25:c9 + - 5c:e8:83:73:25:ca + - 5c:e8:83:73:25:cb + - 5c:e8:83:73:25:cc + - 5c:e8:83:73:25:cd + - 5c:e8:83:73:25:ce + - 5c:e8:83:73:25:cf + - 5c:e8:83:73:25:d0 +model_name: Kunpeng-920 +ipmi_ip: 9.3.3.6 diff --git a/hosts/taishan200-2280-2s48p-256g--a60 b/hosts/taishan200-2280-2s48p-256g--a60 new file mode 100644 index 0000000..5a122da --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a60 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-35000c500bd67640b + - /dev/disk/by-id/scsi-35000c500bd6707a7 + - /dev/disk/by-id/scsi-35000c500bd680dc3 + - /dev/disk/by-id/scsi-35000c500bd683a73 +mac_addr: + - e0:00:84:2b:51:7d + - e0:00:84:2b:51:7e + - e0:00:84:2b:51:7f + - e0:00:84:2b:51:80 + - e0:00:84:2b:51:81 + - e0:00:84:2b:51:82 + - e0:00:84:2b:51:83 + - e0:00:84:2b:51:84 +model_name: Kunpeng-920 +ipmi_ip: 9.3.4.1 diff --git a/hosts/taishan200-2280-2s48p-256g--a61 b/hosts/taishan200-2280-2s48p-256g--a61 new file mode 100644 index 0000000..f1eb906 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a61 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399886a7869 + - /dev/disk/by-id/scsi-350000399886acc5d + - /dev/disk/by-id/scsi-350000399886b6861 + - /dev/disk/by-id/scsi-350000399886ac70d +mac_addr: + - 44:67:47:c9:e4:b8 + - 44:67:47:c9:e4:b9 + - 44:67:47:c9:e4:ba + - 44:67:47:c9:e4:bb + - 44:67:47:c9:e4:bc + - 44:67:47:c9:e4:bd + - 44:67:47:c9:e4:be + - 44:67:47:c9:e4:bf +model_name: Kunpeng-920 +ipmi_ip: 9.3.4.2 diff --git a/hosts/taishan200-2280-2s48p-256g--a62 b/hosts/taishan200-2280-2s48p-256g--a62 new file mode 100644 index 0000000..970d6ea --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a62 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b892d131 + - /dev/disk/by-id/scsi-350000399b892d619 + - /dev/disk/by-id/scsi-350000399b892dc1d + - /dev/disk/by-id/scsi-350000399b892dbb5 +mac_addr: + - 44:67:47:c9:e3:3a + - 44:67:47:c9:e3:3b + - 44:67:47:c9:e3:3c + - 44:67:47:c9:e3:3d + - 44:67:47:c9:e3:3e + - 44:67:47:c9:e3:3f + - 44:67:47:c9:e3:40 + - 44:67:47:c9:e3:41 +model_name: Kunpeng-920 +ipmi_ip: 9.3.4.3 diff --git a/hosts/taishan200-2280-2s48p-256g--a66 b/hosts/taishan200-2280-2s48p-256g--a66 index 881f2d6..39b69b8 100644 --- a/hosts/taishan200-2280-2s48p-256g--a66 +++ b/hosts/taishan200-2280-2s48p-256g--a66 @@ -1,12 +1,11 @@ nr_node: 4 nr_cpu: 96 -memory: 256G -nr_hdd_partitions: 3 +memory: 252G +nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-35000c5009a671773 - /dev/disk/by-id/scsi-35000c5009a690c53 - /dev/disk/by-id/scsi-35000c5009a6713fb -rootfs_partition: - /dev/disk/by-id/scsi-35000c5009a65963f mac_addr: - 5c:e8:83:31:c8:8e @@ -18,3 +17,4 @@ mac_addr: - 5c:e8:83:31:c8:94 - 5c:e8:83:31:c8:95 model_name: Kunpeng-920 +ipmi_ip: 9.3.4.7 diff --git a/hosts/taishan200-2280-2s48p-256g--a67 b/hosts/taishan200-2280-2s48p-256g--a67 index d23d755..79f98db 100644 --- a/hosts/taishan200-2280-2s48p-256g--a67 +++ b/hosts/taishan200-2280-2s48p-256g--a67 @@ -1,12 +1,11 @@ nr_node: 4 nr_cpu: 96 -memory: 256G -nr_hdd_partitions: 3 +memory: 252G +nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88aed21 - /dev/disk/by-id/scsi-350000399b88af325 - /dev/disk/by-id/scsi-350000399b88af699 -rootfs_partition: - /dev/disk/by-id/scsi-350000399b88af421 mac_addr: - 44:67:47:c9:e2:2c @@ -18,3 +17,4 @@ mac_addr: - 44:67:47:c9:e2:32 - 44:67:47:c9:e2:33 model_name: Kunpeng-920 +ipmi_ip: 9.3.4.8 diff --git a/hosts/taishan200-2280-2s48p-256g--a68 b/hosts/taishan200-2280-2s48p-256g--a68 index 0ceb191..37859dc 100644 --- a/hosts/taishan200-2280-2s48p-256g--a68 +++ b/hosts/taishan200-2280-2s48p-256g--a68 @@ -1,12 +1,11 @@ nr_node: 4 nr_cpu: 96 -memory: 256G -nr_hdd_partitions: 3 +memory: 252G +nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8909f81 - /dev/disk/by-id/scsi-350000399b8909f79 - /dev/disk/by-id/scsi-350000399b8909605 -rootfs_partition: - /dev/disk/by-id/scsi-350000399b8909b85 mac_addr: - 84:46:fe:89:b6:e6 @@ -18,3 +17,4 @@ mac_addr: - 84:46:fe:89:b6:ec - 84:46:fe:89:b6:ed model_name: Kunpeng-920 +ipmi_ip: 9.3.4.9 diff --git a/hosts/taishan200-2280-2s48p-256g--a69 b/hosts/taishan200-2280-2s48p-256g--a69 index 5e948ee..5d607e7 100644 --- a/hosts/taishan200-2280-2s48p-256g--a69 +++ b/hosts/taishan200-2280-2s48p-256g--a69 @@ -1,12 +1,11 @@ nr_node: 4 nr_cpu: 96 -memory: 256G -nr_hdd_partitions: 3 +memory: 252G +nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88be92d - /dev/disk/by-id/scsi-350000399b88befc5 - /dev/disk/by-id/scsi-350000399b88be701 -rootfs_partition: - /dev/disk/by-id/scsi-350000399b88bea5d mac_addr: - 44:67:47:c9:d9:4e @@ -18,3 +17,4 @@ mac_addr: - 44:67:47:c9:d9:54 - 44:67:47:c9:d9:55 model_name: Kunpeng-920 +ipmi_ip: 9.3.4.10 diff --git a/hosts/taishan200-2280-2s48p-256g--a70 b/hosts/taishan200-2280-2s48p-256g--a70 index 760ce0c..b3d1416 100644 --- a/hosts/taishan200-2280-2s48p-256g--a70 +++ b/hosts/taishan200-2280-2s48p-256g--a70 @@ -1,12 +1,11 @@ nr_node: 4 nr_cpu: 96 -memory: 256G -nr_hdd_partitions: 3 +memory: 252G +nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b890931d - /dev/disk/by-id/scsi-350000399b8909d79 - /dev/disk/by-id/scsi-350000399b8909ac5 -rootfs_partition: - /dev/disk/by-id/scsi-350000399b8909c99 mac_addr: - 84:46:fe:89:b7:22 @@ -18,3 +17,4 @@ mac_addr: - 84:46:fe:89:b7:28 - 84:46:fe:89:b7:29 model_name: Kunpeng-920 +ipmi_ip: 9.3.4.11 diff --git a/hosts/taishan200-2280-2s48p-256g--a71 b/hosts/taishan200-2280-2s48p-256g--a71 index dde6205..102ff96 100644 --- a/hosts/taishan200-2280-2s48p-256g--a71 +++ b/hosts/taishan200-2280-2s48p-256g--a71 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 256G +memory: 252G mac_addr: - 44:67:47:d7:6d:e6 - 44:67:47:d7:6d:e7 @@ -11,3 +11,4 @@ mac_addr: - 44:67:47:d7:6d:ec - 44:67:47:d7:6d:ed model_name: Kunpeng-920 +ipmi_ip: 9.3.4.12 diff --git a/hosts/taishan200-2280-2s64p-256g--a10 b/hosts/taishan200-2280-2s64p-256g--a10 index 15a9315..3abe369 100644 --- a/hosts/taishan200-2280-2s64p-256g--a10 +++ b/hosts/taishan200-2280-2s64p-256g--a10 @@ -1,7 +1,11 @@ nr_node: 4 nr_cpu: 128 -memory: 256G -rootfs_partition: +memory: 252G +nr_hdd_partitions: 1 +nr_ssd_partitions: 1 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399c8030fd5 +ssd_partitions: - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB44333 mac_addr: - 44:67:47:86:2c:95 @@ -17,3 +21,4 @@ mac_addr: - ac:b3:b5:1e:d5:4d - ac:b3:b5:1e:d5:4e model_name: Kunpeng-920 +ipmi_ip: 9.3.1.10 diff --git a/hosts/taishan200-2280-2s64p-256g--a3 b/hosts/taishan200-2280-2s64p-256g--a3 deleted file mode 100644 index 1bdadca..0000000 --- a/hosts/taishan200-2280-2s64p-256g--a3 +++ /dev/null @@ -1,24 +0,0 @@ -nr_node: 4 -nr_cpu: 128 -memory: 256G -nr_ssd_partitions: 3 -ssd_partitions: - - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43895-part1 - - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43895-part2 - - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43895-part3 -rootfs_partition: - - /dev/disk/by-id/scsi-350000399981347d5 -mac_addr: - - 68:4a:ae:ca:e8:ca - - 68:4a:ae:ca:e8:cb - - 68:4a:ae:ca:e8:cc - - 68:4a:ae:ca:e8:cd - - ac:b3:b5:1f:74:de - - ac:b3:b5:1f:74:df - - ac:b3:b5:1f:74:e0 - - ac:b3:b5:1f:74:e1 - - ac:b3:b5:1f:74:ee - - ac:b3:b5:1f:74:ef - - ac:b3:b5:1f:74:f0 - - ac:b3:b5:1f:74:f1 -model_name: Kunpeng-920 diff --git a/hosts/taishan200-2280-2s64p-256g--a36 b/hosts/taishan200-2280-2s64p-256g--a36 new file mode 100644 index 0000000..e04bc3a --- /dev/null +++ b/hosts/taishan200-2280-2s64p-256g--a36 @@ -0,0 +1,25 @@ +nr_node: 4 +nr_cpu: 128 +memory: 255G +nr_hdd_partitions: 1 +nr_ssd_partitions: 1 +hdd_partitions: + - /dev/disk/by-id/scsi-3500003999813487d +ssd_partitions: + - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB42949-part1 + - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB42949-part2 +mac_addr: + - 84:46:fe:73:b2:75 + - 84:46:fe:73:b2:76 + - 84:46:fe:73:b2:77 + - 84:46:fe:73:b2:78 + - ac:b3:b5:1e:bd:5b + - ac:b3:b5:1e:bd:5c + - ac:b3:b5:1e:bd:5d + - ac:b3:b5:1e:bd:5e + - ac:b3:b5:1e:bd:bb + - ac:b3:b5:1e:bd:bc + - ac:b3:b5:1e:bd:bd + - ac:b3:b5:1e:bd:be +model_name: Kunpeng-920 +ipmi_ip: 9.3.2.1 diff --git a/hosts/taishan200-2280-2s64p-256g--a4 b/hosts/taishan200-2280-2s64p-256g--a4 deleted file mode 100644 index 8ef481c..0000000 --- a/hosts/taishan200-2280-2s64p-256g--a4 +++ /dev/null @@ -1,24 +0,0 @@ -nr_node: 4 -nr_cpu: 128 -memory: 256G -nr_ssd_partitions: 3 -ssd_partitions: - - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43892-part1 - - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43892-part2 - - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43892-part3 -rootfs_partition: - - /dev/disk/by-id/scsi-350000399c802cfb9 -mac_addr: - - 68:4a:ae:ca:e8:a2 - - 68:4a:ae:ca:e8:a3 - - 68:4a:ae:ca:e8:a4 - - 68:4a:ae:ca:e8:a5 - - ac:b3:b5:1f:74:6e - - ac:b3:b5:1f:74:6f - - ac:b3:b5:1f:74:70 - - ac:b3:b5:1f:74:71 - - ac:b3:b5:1f:7d:4e - - ac:b3:b5:1f:7d:4f - - ac:b3:b5:1f:7d:50 - - ac:b3:b5:1f:7d:51 -model_name: Kunpeng-920 diff --git a/hosts/taishan200-2280-2s64p-256g--a40 b/hosts/taishan200-2280-2s64p-256g--a40 new file mode 100644 index 0000000..1a806ee --- /dev/null +++ b/hosts/taishan200-2280-2s64p-256g--a40 @@ -0,0 +1,22 @@ +nr_node: 4 +nr_cpu: 128 +memory: 252G +nr_hdd_partitions: 2 +hdd_partitions: + - /dev/disk/by-id/scsi-3500003999812ed81 + - /dev/disk/by-id/scsi-350000399c8020115 +mac_addr: + - 84:46:fe:89:be:8e + - 84:46:fe:89:be:8f + - 84:46:fe:89:be:90 + - 84:46:fe:89:be:91 + - ac:b3:b5:1e:d7:3b + - ac:b3:b5:1e:d7:3c + - ac:b3:b5:1e:d7:3d + - ac:b3:b5:1e:d7:3e + - ac:b3:b5:1e:d6:cb + - ac:b3:b5:1e:d6:cc + - ac:b3:b5:1e:d6:cd + - ac:b3:b5:1e:d6:ce +model_name: Kunpeng-920 +ipmi_ip: 9.3.2.5 diff --git a/hosts/taishan200-2280-2s64p-256g--a41 b/hosts/taishan200-2280-2s64p-256g--a41 new file mode 100644 index 0000000..5b22bcc --- /dev/null +++ b/hosts/taishan200-2280-2s64p-256g--a41 @@ -0,0 +1,22 @@ +nr_node: 4 +nr_cpu: 128 +memory: 252G +nr_hdd_partitions: 2 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8919495 + - /dev/disk/by-id/scsi-35000039998130a85 +mac_addr: + - 84:46:fe:89:bc:4a + - 84:46:fe:89:bc:4b + - 84:46:fe:89:bc:4c + - 84:46:fe:89:bc:4d + - ac:b3:b5:1e:b6:db + - ac:b3:b5:1e:b6:dc + - ac:b3:b5:1e:b6:dd + - ac:b3:b5:1e:b6:de + - ac:b3:b5:1e:b7:5b + - ac:b3:b5:1e:b7:5c + - ac:b3:b5:1e:b7:5d + - ac:b3:b5:1e:b7:5e +model_name: Kunpeng-920 +ipmi_ip: 9.3.2.6 diff --git a/hosts/taishan200-2280-2s64p-256g--a42 b/hosts/taishan200-2280-2s64p-256g--a42 new file mode 100644 index 0000000..442b958 --- /dev/null +++ b/hosts/taishan200-2280-2s64p-256g--a42 @@ -0,0 +1,22 @@ +nr_node: 4 +nr_cpu: 128 +memory: 252G +nr_hdd_partitions: 2 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8918a11 + - /dev/disk/by-id/scsi-350000399c802ee75 +mac_addr: + - cc:05:77:fe:d8:64 + - cc:05:77:fe:d8:65 + - cc:05:77:fe:d8:66 + - cc:05:77:fe:d8:67 + - 44:a1:91:35:6c:50 + - 44:a1:91:35:6c:51 + - 44:a1:91:35:6c:52 + - 44:a1:91:35:6c:53 + - 44:a1:91:35:68:d0 + - 44:a1:91:35:68:d1 + - 44:a1:91:35:68:d2 + - 44:a1:91:35:68:d3 +model_name: Kunpeng-920 +ipmi_ip: 9.3.2.7 diff --git a/hosts/taishan200-2280-2s64p-256g--a8 b/hosts/taishan200-2280-2s64p-256g--a8 deleted file mode 100644 index fd22672..0000000 --- a/hosts/taishan200-2280-2s64p-256g--a8 +++ /dev/null @@ -1,15 +0,0 @@ -nr_node: 4 -nr_cpu: 128 -memory: 256G -rootfs_partition: - - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43325 -mac_addr: - - 84:46:fe:26:12:f5 - - 84:46:fe:26:12:f6 - - 84:46:fe:26:12:f7 - - 84:46:fe:26:12:f8 - - ac:b3:b5:1e:b6:7b - - ac:b3:b5:1e:b6:7c - - ac:b3:b5:1e:b6:7d - - ac:b3:b5:1e:b6:7e -model_name: Kunpeng-920 diff --git a/hosts/taishan200-2280-2s64p-256g--a9 b/hosts/taishan200-2280-2s64p-256g--a9 index a6aee01..16cdfe7 100644 --- a/hosts/taishan200-2280-2s64p-256g--a9 +++ b/hosts/taishan200-2280-2s64p-256g--a9 @@ -1,10 +1,9 @@ nr_node: 4 nr_cpu: 128 memory: 256G -nr_hdd_partitions: 1 +nr_hdd_partitions: 2 hdd_partitions: - /dev/disk/by-id/scsi-35000c500bd6a1347 -rootfs_partition: - /dev/disk/by-id/scsi-35000c500bd62acb3 mac_addr: - cc:05:77:fe:d4:0e @@ -16,3 +15,4 @@ mac_addr: - 44:a1:91:35:1a:72 - 44:a1:91:35:1a:73 model_name: Kunpeng-920 +ipmi_ip: 9.3.1.9 -- 2.23.0

1 0