Compass-ci

compass-ci@openeuler.org

October 2020

31 participants
682 discussions

[PATCH lkp-tests 2/3] fix(iso2rootfs): the ip of the newest openeuler iso url has changed
by Yu Chuan 13 Oct '20

13 Oct '20

The ip of the newest openeuler iso url has changed from the public ip to the internal ip. So replace it while running. Signed-off-by: Yu Chuan <13186087857(a)163.com> --- tests/iso2rootfs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/iso2rootfs b/tests/iso2rootfs index b60a82a7c972..735c2b9aabcd 100755 --- a/tests/iso2rootfs +++ b/tests/iso2rootfs @@ -59,6 +59,10 @@ check_yaml_vars() get_daily_iso_checksum() { ISO_URL="$(curl "${iso_url_file}")" + [ "${iso_os}" == "openeuler" ] && { + local pub_ip=$(echo "${iso_url_file}" | grep -oEw "[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}") + ISO_URL="$(curl "${iso_url_file}" |sed -r "s/[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/${pub_ip}/g")" + } ISO_NAME=$(basename "$ISO_URL") ISO_CHECKSUM_URL="${ISO_URL}.sha256sum" -- 2.23.0

1 0

[PATCH lkp-tests 1/3] feat(iso2rootfs): make the rootfs mount type optional
by Yu Chuan 13 Oct '20

13 Oct '20

Current rootfs mount type only support nfs, make it optional, and support cifs mount type. Signed-off-by: Yu Chuan <13186087857(a)163.com> --- jobs/iso2rootfs.yaml | 5 ++-- tests/iso2rootfs | 64 +++++++++++++++++++++++++++++++++----------- 2 files changed, 51 insertions(+), 18 deletions(-) diff --git a/jobs/iso2rootfs.yaml b/jobs/iso2rootfs.yaml index 722c4903c84a..f413c9cee1f0 100644 --- a/jobs/iso2rootfs.yaml +++ b/jobs/iso2rootfs.yaml @@ -6,7 +6,8 @@ iso2rootfs: iso_os: iso_arch: iso_version: - rootfs_nfs_server: - rootfs_nfs_path: + rootfs_protocol: + rootfs_server: + rootfs_path: initrd_http_host: initrd_http_port: diff --git a/tests/iso2rootfs b/tests/iso2rootfs index 38e4b0a4daee..b60a82a7c972 100755 --- a/tests/iso2rootfs +++ b/tests/iso2rootfs @@ -42,8 +42,9 @@ check_yaml_vars() "iso_os" "iso_arch" "iso_version" - "rootfs_nfs_server" - "rootfs_nfs_path" + "rootfs_protocol" + "rootfs_server" + "rootfs_path" "initrd_http_host" "initrd_http_port" ) @@ -64,20 +65,39 @@ get_daily_iso_checksum() SHA256SUM_NET=$(curl -s "$ISO_CHECKSUM_URL" | awk '{print $1}') } -mount_nfs() +mount_rootfs() { - NFS_SERVER_PATH="${rootfs_nfs_server}:${rootfs_nfs_path}/${iso_os}/${iso_arch}/debug-versions/dailybuild" - NFS_LOCAL_PATH="${WORKSPACE}/crystal_os_${iso_os}_${iso_arch}" - - [ -d "${NFS_LOCAL_PATH}" ] || mkdir -p "$NFS_LOCAL_PATH" - mount -t nfs "${NFS_SERVER_PATH}" "${NFS_LOCAL_PATH}" + case ${rootfs_protocol} in + "nfs") + ROOTFS_SERVER_PATH="${rootfs_server}:${rootfs_path}/${iso_os}/${iso_arch}/debug-versions/dailybuild" + install_pkgs "nfs-utils" + ;; + "cifs") + ROOTFS_SERVER_PATH="//${rootfs_server}/${rootfs_path}/${iso_os}/${iso_arch}/debug-versions/dailybuild" + ROOTFS_MOUNT_PARAM="guest,vers=1.0,noacl,nouser_xattr" + install_pkgs "cifs-utils" + ;; + *) + die "rootfs_protocol is none, exit !!!" + ;; + esac + + ROOTFS_LOCAL_PATH="${WORKSPACE}/compass_os_${iso_os}_${iso_arch}" + + [ -d "${ROOTFS_LOCAL_PATH}" ] || mkdir -p "$ROOTFS_LOCAL_PATH" + if [ -n "${ROOTFS_MOUNT_PARAM}" ] + then + mount -t ${rootfs_protocol} -o "${ROOTFS_MOUNT_PARAM}" "${ROOTFS_SERVER_PATH}" "${ROOTFS_LOCAL_PATH}" + else + mount -t ${rootfs_protocol} "${ROOTFS_SERVER_PATH}" "${ROOTFS_LOCAL_PATH}" + fi } get_cache_iso_checksum() { - mount_nfs + mount_rootfs - CHECKSUM_FILE_CACHE="${NFS_LOCAL_PATH}/${iso_version}-newest.sha256sum" + CHECKSUM_FILE_CACHE="${ROOTFS_LOCAL_PATH}/${iso_version}-newest.sha256sum" [ ! -f "${CHECKSUM_FILE_CACHE}" ] || SHA256SUM_CACHE=$(awk '{print $1}' "$CHECKSUM_FILE_CACHE") } @@ -155,6 +175,7 @@ config_git_proxy() config_iso2rootfs() { log_info "starting config iso2rootfs env ..." + install_pkgs "wget" get_cgz source "${CGZ_PATH}/config" @@ -222,12 +243,12 @@ run_iso2qcow2() download_compass_ci() { [ -d "${CCI_SRC}" ] && rm -rf "${CCI_SRC}" - git clone "$CRYSTAL_CI_GIT_URL" "${CCI_SRC}" + git clone "$COMPASS_CI_GIT_URL" "${CCI_SRC}" } config_rootfs_dir() { - ROOTFS_DES_DIR=${NFS_LOCAL_PATH}/${iso_version}-$(date "+%Y%m%d%H%M%S") + ROOTFS_DES_DIR=${ROOTFS_LOCAL_PATH}/${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" @@ -279,12 +300,23 @@ test_rootfs() local kernel_path=$(realpath "${ROOTFS_DES_DIR}"/boot/vmlinuz*|grep -v rescue) local initrd_lkp_path=$(realpath "${ROOTFS_DES_DIR}"/boot/initramfs.lkp*) - local nfsroot_path="${NFS_SERVER_PATH}/$(basename "${ROOTFS_DES_DIR}")" + local root_path + case ${rootfs_protocol} in + "nfs") + root_path="${ROOTFS_SERVER_PATH}/$(basename "${ROOTFS_DES_DIR}")" + ;; + "cifs") + root_path="cifs:${ROOTFS_SERVER_PATH}/$(basename "${ROOTFS_DES_DIR}"),${ROOTFS_MOUNT_PARAM}" + ;; + *) + die "rootfs_protocol is none, exit !!!" + ;; + esac get_qemu_efi_fd sed -i "s|KERNEL|\"${kernel_path}\"|g" "$test_script" sed -i "s|INITRD_LKP|\"${initrd_lkp_path}\"|g" "$test_script" - sed -i "s|NFS_ROOT|\"${nfsroot_path}\"|g" "$test_script" + sed -i "s|ROOT|\"${root_path}\"|g" "$test_script" sed -i "s|QEMU_EFI_FD|\"${EFI_FD_PATH}\"|g" "$test_script" cd "$(dirname "${test_script}")" @@ -305,7 +337,7 @@ test_rootfs() send_user "\[INFO\] test rootfs ok" exit 0 } - "nfs: server * not responding, timed out" { + "server * not responding, timed out" { send_user "\[WARNING\] rootfs can start, but need to disable some services" exit 0 } @@ -330,7 +362,7 @@ post_works() update_sha256sum_file - umount "${NFS_LOCAL_PATH}" + umount "${ROOTFS_LOCAL_PATH}" log_info "iso2rootfs finished" } -- 2.23.0

1 0

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

13 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/3] host file add ipmi_ip
by Zhang Dewan 13 Oct '20

13 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

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

13 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

1 0

[PATCH compass-ci] git_mirror: fix git-remote-http <defunct>
by Li Yuanchao 13 Oct '20

13 Oct '20

when use system() or %x() call shell command git, there would be a new child process to do git command. And it seems the child process doesn't clear everytime when it's finished. It needs to be waited by parent process. But it often comes out 'no child' error when wait in main thread, so I trap SIGCHLD to SIG_IGN, and the init process will handle it. Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- lib/git_mirror.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/git_mirror.rb b/lib/git_mirror.rb index 88a94ac..0420c10 100644 --- a/lib/git_mirror.rb +++ b/lib/git_mirror.rb @@ -46,7 +46,7 @@ class GitMirror def git_fetch(mirror_dir) fetch_info = %x(git -C #{mirror_dir} fetch 2>&1) # Check whether mirror_dir is a good git repository by 3 conditions. If not, delete it. - if ($CHILD_STATUS.exitstatus == ERR_CODE) && fetch_info.include?(ERR_MESSAGE) && Dir.empty?(mirror_dir) + if fetch_info.include?(ERR_MESSAGE) && Dir.empty?(mirror_dir) FileUtils.rmdir(mirror_dir) end return fetch_info.include? '->' @@ -89,6 +89,7 @@ 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) -- 2.23.0

3 4

[PATCH v2 compass-ci 4/5] container/send-internet-mail: build file
by Luan Shengde 13 Oct '20

13 Oct '20

Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/send-internet-mail/build | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 container/send-internet-mail/build diff --git a/container/send-internet-mail/build b/container/send-internet-mail/build new file mode 100755 index 0000000..078adaf --- /dev/null +++ b/container/send-internet-mail/build @@ -0,0 +1,5 @@ +#!/bin/sh +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +docker build -t send-internet-mail:latest . -- 2.23.0

1 0

[PATCH v2 compass-ci 3/5] container/send-internet-mail: Dockerfile
by Luan Shengde 13 Oct '20

13 Oct '20

Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/send-internet-mail/Dockerfile | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 container/send-internet-mail/Dockerfile diff --git a/container/send-internet-mail/Dockerfile b/container/send-internet-mail/Dockerfile new file mode 100644 index 0000000..b8bc3a5 --- /dev/null +++ b/container/send-internet-mail/Dockerfile @@ -0,0 +1,21 @@ +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +FROM debian + +MAINTAINER shdluan(a)163.com + +ENV DEBIAN_FRONTEND noninteractive + +RUN apt-get update && \ + apt-get install -y ruby-mail ruby-json ruby-sinatra && \ + ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ + echo 'Asia/Shanghai' > /etc/timezone + +EXPOSE 25 + +COPY mail-post.rb /usr/local/bin/ + +COPY send-internet-mail.rb /usr/local/bin/ + +CMD ["/usr/local/bin/mail-post.rb"] -- 2.23.0

1 0

[PATCH v2 compass-ci 2/5] container/send-internet-mail: send-internet-mail.rb
by Luan Shengde 13 Oct '20

13 Oct '20

setup smtp send mail with received email info Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- .../send-internet-mail/send-internet-mail.rb | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100755 container/send-internet-mail/send-internet-mail.rb diff --git a/container/send-internet-mail/send-internet-mail.rb b/container/send-internet-mail/send-internet-mail.rb new file mode 100755 index 0000000..f0d7698 --- /dev/null +++ b/container/send-internet-mail/send-internet-mail.rb @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true + +require 'mail' + +# setup smtp config +smtp = { + address: 'smtp.qq.com', + port: 25, + domain: 'qq.com', + user_name: 'compass-ci(a)qq.com', + password: 'passwd for user_name', + # enable_ssl: true, + # authentication: :login, + openssl_verify_mode: 'none', + enable_starttls_auto: true +} + +Mail.defaults { delivery_method :smtp, smtp } + +# send mail +def send_mail(mail_info) + mail = Mail.new do + references mail_info['references'] + from 'compass-ci(a)qq.com' + to mail_info['to'] + subject mail_info['subject'] + body mail_info['body'] + end + mail.deliver! +end -- 2.23.0

1 0

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

13 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

← Newer
1
...
56
57
58
59
60
61
62
...
69
Older →

Jump to page: