From f159b10de1ec9593ee617098e8f8f055c467c0ea Mon Sep 17 00:00:00 2001 From: Jared Vititoe Date: Sat, 24 Jan 2026 21:10:56 -0500 Subject: [PATCH] Add large1 mappings and update layout - Add PCI path mappings for large1 (12 SATA/SAS + 2 NVMe drives) - Update large1 layout to show actual drive assignments - Controllers: LSI SAS2008 (7), AMD SATA (3), ASMedia SATA (2), NVMe (2) Co-Authored-By: Claude Opus 4.5 --- driveAtlas.sh | 77 +++++++++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 33 deletions(-) diff --git a/driveAtlas.sh b/driveAtlas.sh index e730bed..d03e664 100644 --- a/driveAtlas.sh +++ b/driveAtlas.sh @@ -86,38 +86,32 @@ generate_micro_layout() { } generate_large1_layout() { + local hostname=$1 build_drive_map - cat << 'EOF' -┌─────────────────────────────────────────────────────────────┐ -│ large1 │ -│ Unique 3x5 Grid Chassis │ -│ │ -│ ┌──────────────────────────────────────────────┐ │ -│ │ Motherboard │ │ -│ │ │ │ -│ │ ┌──┐┌──┐ │ │ -│ │ │M1││M2│ │ │ -│ │ └──┘└──┘ │ │ -│ └──────────────────────────────────────────────┘ │ -│ │ -│ ┌─────────────────┐ ┌─────────────────┐ ┌─────────────────┐ │ -│ │ │ │ │ │ │ │ -│ │ 1 │ │ 2 │ │ 3 │ │ -│ │ │ │ │ │ │ │ -│ └─────────────────┘ └─────────────────┘ └─────────────────┘ │ -│ ┌─────────────────┐ ┌─────────────────┐ ┌─────────────────┐ │ -│ │ │ │ │ │ │ │ -│ │ 4 │ │ 5 │ │ 6 │ │ -│ │ │ │ │ │ │ │ -│ └─────────────────┘ └─────────────────┘ └─────────────────┘ │ -│ ┌─────────────────┐ ┌─────────────────┐ ┌─────────────────┐ │ -│ │ │ │ │ │ │ │ -│ │ 7 │ │ 8 │ │ 9 │ │ -│ │ │ │ │ │ │ │ -│ └─────────────────┘ └─────────────────┘ └─────────────────┘ │ -└─────────────────────────────────────────────────────────────┘ -EOF + printf "┌─────────────────────────────────────────────────────────────────────────┐\n" + printf "│ %-69s │\n" "$hostname - Custom Tower (3x4 Grid + Internal)" + printf "│ │\n" + printf "│ NVMe Slots: M1: %-10s M2: %-10s │\n" "${DRIVE_MAP[m2-1]:-EMPTY}" "${DRIVE_MAP[m2-2]:-EMPTY}" + printf "│ │\n" + printf "│ HBA Bays (SAS2008): │\n" + printf "│ ┌──────────┐ ┌──────────┐ ┌──────────┐ ┌──────────┐ │\n" + printf "│ │1:%-8s│ │2:%-8s│ │3:%-8s│ │4:%-8s│ │\n" "${DRIVE_MAP[1]:-EMPTY}" "${DRIVE_MAP[2]:-EMPTY}" "${DRIVE_MAP[3]:-EMPTY}" "${DRIVE_MAP[4]:-EMPTY}" + printf "│ └──────────┘ └──────────┘ └──────────┘ └──────────┘ │\n" + printf "│ ┌──────────┐ ┌──────────┐ ┌──────────┐ │\n" + printf "│ │5:%-8s│ │6:%-8s│ │7:%-8s│ │\n" "${DRIVE_MAP[5]:-EMPTY}" "${DRIVE_MAP[6]:-EMPTY}" "${DRIVE_MAP[7]:-EMPTY}" + printf "│ └──────────┘ └──────────┘ └──────────┘ │\n" + printf "│ │\n" + printf "│ Internal SATA (AMD 16:00.1): │\n" + printf "│ ┌──────────┐ ┌──────────┐ ┌──────────┐ │\n" + printf "│ │8:%-8s│ │9:%-8s│ │10:%-7s│ │\n" "${DRIVE_MAP[8]:-EMPTY}" "${DRIVE_MAP[9]:-EMPTY}" "${DRIVE_MAP[10]:-EMPTY}" + printf "│ └──────────┘ └──────────┘ └──────────┘ │\n" + printf "│ │\n" + printf "│ ASMedia SATA (25:00.0): │\n" + printf "│ ┌──────────┐ ┌──────────┐ │\n" + printf "│ │11:%-7s│ │12:%-7s│ │\n" "${DRIVE_MAP[11]:-EMPTY}" "${DRIVE_MAP[12]:-EMPTY}" + printf "│ └──────────┘ └──────────┘ │\n" + printf "└─────────────────────────────────────────────────────────────────────────┘\n" } #------------------------------------------------------------------------------ @@ -172,9 +166,26 @@ declare -A SERVER_MAPPINGS=( " # large1 - # Unique chassis - 1/1 configuration - # TODO: Map actual PCI paths after running diagnose-drives.sh + # Custom tower with multiple controllers: + # - HBA: LSI SAS2008 at 10:00.0 (7 drives) + # - AMD SATA at 16:00.1 (3 drives) + # - ASMedia SATA at 25:00.0 (2 drives) + # - 2x NVMe slots ["large1"]=" + pci-0000:10:00.0-sas-phy0-lun-0 1 + pci-0000:10:00.0-sas-phy1-lun-0 2 + pci-0000:10:00.0-sas-phy3-lun-0 3 + pci-0000:10:00.0-sas-phy4-lun-0 4 + pci-0000:10:00.0-sas-phy5-lun-0 5 + pci-0000:10:00.0-sas-phy6-lun-0 6 + pci-0000:10:00.0-sas-phy7-lun-0 7 + pci-0000:16:00.1-ata-3 8 + pci-0000:16:00.1-ata-7 9 + pci-0000:16:00.1-ata-8 10 + pci-0000:25:00.0-ata-1 11 + pci-0000:25:00.0-ata-2 12 + pci-0000:2a:00.0-nvme-1 m2-1 + pci-0000:26:00.0-nvme-1 m2-2 " # micro1 @@ -256,7 +267,7 @@ case "$CHASSIS_TYPE" in generate_10bay_layout "$HOSTNAME" ;; "large1") - generate_large1_layout + generate_large1_layout "$HOSTNAME" ;; "micro") generate_micro_layout "$HOSTNAME"