Merge pull request #75 from ching-kuo/update_docs

Fix Mistakes in Previous Commit
cloud-native-taiwan · Dec 17, 2024 · 3e27730 · 3e27730
2 parents bc083d0 + c199826
commit 3e27730
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/docs/architecture/iaas.md b/docs/architecture/iaas.md
@@ -23,9 +23,9 @@ Infra Labs 使用了 6 台伺服器來提供 IaaS 服務：
 | Hostname      | CPU                                              | RAM                             | NIC                                                                 | Boot Disk                                                    | Ceph Disk                                                                        |
 |---------------|--------------------------------------------------|--------------------------------|--------------------------------------------------------------------|------------------------------------------------------------|---------------------------------------------------------------------------------|
 | openstack01-02 | AMD Epyc Rome 7282 * 2                         | 32GB DDR4 2933MHz ECC RDIMM * 16 | On-board dual port 1GbE, Mellanox ConnectX-4 Lx dual port 25GbE | Intel 730 240GB or Sandisk CloudSpeed Eco Gen II 480GB   | KIOXIA CD6 3.84TB, Intel DC S3500 1.6TB                                       |
-| openstack04-05 | AMD Epyc Milan 7413                            | 32GB DDR4 3200MHz ECC RDIMM * 8  | On-board quad port 1GbE, Mellanox ConnectX-4 Lx dual port 25GbE | Seagate Enterprise Performance 15K 900GB * 2              | Samsung NGSFF PM983 3.84TB, Intel DC S3500 1.6TB (openstack05 only), Seagate X18 16TB |
-| openstack06    | Xeon Silver 4110                               | 32GB DDR4 2666MHz ECC RDIMM * 6  | On-board dual port 1GbE, Mellanox ConnectX-4 Lx dual port 25GbE | Intel S3500 120GB * 2                                     | Seagate X18 16TB                                                                 |
-| arm01-03       | Ampere Altra Q80-30 * 2                        | 32GB DDR4 3200MHz ECC RDIMM * 4  | On-board dual port 1GbE, Mellanox ConnectX-4 Lx dual port 25GbE | Samsung PM9A3 512GB                                       | N/A                                                                              |
+| openstack04-05 | AMD Epyc Milan 7413                            | 32GB DDR4 3200MHz ECC RDIMM * 8  | On-board quad port 1GbE, Mellanox ConnectX-4 Lx dual port 25GbE | Seagate Enterprise Performance 15K 900GB * 2              | Samsung NGSFF PM983 3.84TB, Intel DC S3500 1.6TB (openstack05 only), Seagate X18 16TB * 2|
+| openstack06    | Xeon Silver 4110                               | 32GB DDR4 2666MHz ECC RDIMM * 6  | On-board dual port 1GbE, Mellanox ConnectX-4 Lx dual port 25GbE | Intel S3500 120GB * 2                                     | Seagate X18 16TB * 2                                                                |
+| arm01          | Ampere Altra Q80-30 * 2                        | 32GB DDR4 3200MHz ECC RDIMM * 4  | On-board dual port 1GbE, Mellanox ConnectX-4 Lx dual port 25GbE | Samsung PM9A3 512GB                                       | N/A                                                                              |
 
 ## 軟體
 

diff --git a/docs/architecture/network.md b/docs/architecture/network.md
@@ -8,6 +8,8 @@
 
 ## 架構總覽
 
+![High Level Network](images/high_level_network.png)
+
 上圖展示了 Infra Labs 網路的整體架構。主要由以下幾個部分組成：
 
 - 路由器：NFX250，負責 NAT、VPN 等功能