Compass-ci
Threads by month
- ----- 2025 -----
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
October 2020
- 31 participants
- 682 discussions
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
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
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
---
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
---
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
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
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
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
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
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