Merge pull request #83 from swordqiu/automated-cherry-pick-of-#82-ups…

…tream-release-3.10 Automated cherry pick of #82: fix: update 20231227
yunionio · Dec 27, 2023 · cf3e97d · cf3e97d
2 parents 236bc19 + 10387a7
commit cf3e97d
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 8 deletions.
diff --git a/docs/guides/onpremise/storage/blockstorage/index.mdx b/docs/guides/onpremise/storage/blockstorage/index.mdx
@@ -25,7 +25,7 @@ sidebar_position: 1
 | 访问接口\部署架构        |  本地访问           | 集中式网络访问       | 去中心分布式访问 |
 |----------------|-------------------|--------------------|----------------|
 | 文件接口        | 本地存储            | NAS                |                |
-| 块接口          | 本地LVM            | LVM                |                |
+| 块接口          | 本地LVM            | cLVM               |                |
 | 自定义接口       |                   |                    | Ceph RBD       |
 
 ## 支持存储类型

diff --git a/docs/guides/onpremise/vminstance/passthrough/sriov.md b/docs/guides/onpremise/vminstance/passthrough/sriov.md
@@ -39,7 +39,7 @@ $ grub2-mkconfig -o /boot/grub2/grub.cfg
 
 #### Mellanox 网卡配置
 
-Mellanox 网卡需要安装 MLNX_OFED 驱动，参考他们的官方文档：
+Mellanox 网卡需要安装 MLNX_OFED 驱动，参考其官方文档：
 
 - [https://enterprise-support.nvidia.com/s/article/howto-install-mlnx-ofed-driver](https://enterprise-support.nvidia.com/s/article/howto-install-mlnx-ofed-driver)
 - [https://docs.nvidia.com/networking/display/MLNXOFEDv461000/Installing+Mellanox+OFED](https://docs.nvidia.com/networking/display/MLNXOFEDv461000/Installing+Mellanox+OFED)
@@ -137,9 +137,12 @@ $ climc server-attach-network c15a5a99-75ea-4b8c-8c7a-521e5f980db4 \
 
 ## OVS Offload
 
-OVS Offload 是基于 SR-IOV 实现的一种硬件卸载的技术；如果硬件支持 OVS Offload, 则能够让 OVS 数据面卸载到网卡上，OVS 控制面不用做任何更改。
+OVS Offload 是部分厂商基于 SR-IOV 实现的一种OpenvSwitch数据转发硬件卸载的技术；如果硬件支持 OVS Offload, 则能够让 OVS 数据面卸载到网卡上，OVS 控制面不用做任何更改。
+
 OVS Offload 的基础配置依赖于 SR-IOV 的配置，确保宿主机已经打开了 SR-IOV。然后需要安装开启 OVS Offload 必要的依赖，如 Mellanox 网卡需要安装 MLNX_OFED 驱动。
 
+目前，Mellanox的Connext-6系列网卡支持OVS Offload。
+
 ### 安装 OFED驱动，配置 SRIOV VF
 ```
 # 注意要使用 gcc 高版本
@@ -223,6 +226,8 @@ Mellanox 网卡支持的 bond 模式为:
 这意味着，在 Active-Backup 模式下，只要有一个 PF active，来自任何 VF 的流量都可以通过这个 PF 发送。
 在 XOR 或 LACP 模式下，如果两个 PF 都 active，来自 VF 的流量将在这两个 PF 之间分配。
 
+具体Bond配置方法请参考其他文档。
+
 网卡配置好 bond 后修改 host.conf 配置文件：
 ```bash
 $ vi /etc/yunion/host.conf
@@ -277,3 +282,15 @@ $ reboot
 	Kernel driver in use: mlx5_core
 	Kernel modules: mlx5_core
 ```
+
+#### 如何验证OVS Offload是否生效
+
+首先，确认OpenvSwitch在控制面已经打开硬件卸载特性：
+
+```bash
+$ ovs-vsctl list Open_vSwitch . | grep other_config
+## 输出内容需要包含hw-offload="true"
+other_config        : {hw-offload="true"}
+````
+
+其次，执行  `ovs-appctl dpctl/dump-flows type=offloaded` 查看卸载到硬件转发表的流表，如果硬件卸载未生效，则输出为空。
diff --git a/i18n/en/docusaurus-plugin-content-docs/current/getting-started/full/index.mdx b/i18n/en/docusaurus-plugin-content-docs/current/getting-started/full/index.mdx
@@ -2,9 +2,9 @@
 sidebar_position: 3
 ---
 
-# Hybrid Cloud
+# Unified Cloud
 
-Hybrid Cloud Installation and Deployment
+Unified Cloud Installation and Deployment
 
 import DocCardList from '@theme/DocCardList';
 import { useCurrentSidebarCategory } from '@docusaurus/theme-common';

diff --git a/i18n/en/docusaurus-plugin-content-docs/current/getting-started/index.mdx b/i18n/en/docusaurus-plugin-content-docs/current/getting-started/index.mdx
@@ -17,8 +17,8 @@ import TabItem from '@theme/TabItem';
     - [Quick Start: Multi-cloud Management Deployment using ocboot](./cmp/quickstart-ocboot)
     - [Quick Start: Multi-cloud Management Deployment using docker compose](./cmp/quickstart-docker-compose)
     - [Quick Start: Multi-cloud Management Deployment using helm on Kubernetes](./cmp/quickstart-k8s-helm)
-- Hybrid Cloud: Hybrid cloud deployment includes the functionality of lightweight private cloud and multi-cloud management.
-    - [Quick Start: Hybrid Cloud Deployment](./full/quickstart-full)
+- Unified Cloud: Unified cloud deployment includes the functionality of both lightweight private cloud and multi-cloud management.
+    - [Quick Start: Unified Cloud Deployment](./full/quickstart-full)
 
 import DocCardList from '@theme/DocCardList';
 import { useCurrentSidebarCategory } from '@docusaurus/theme-common';

diff --git a/src/pages/index.js b/src/pages/index.js
@@ -31,7 +31,7 @@ function HomepageHeader() {
               <Translate id="homepage.subtitle">云原生的开源融合云平台</Translate>
             </p>
             <p className="hero__title">
-              <Translate id="homepage.buildown">构建您自己的云上之云</Translate>
+              <Translate id="homepage.buildown">构建您专属的云上之云</Translate>
             </p>
             <div className={styles.buttons}>
               <Link