From 63bcc476a5bf682482f0c11f91695f8428eb99ba Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Mon, 30 Dec 2024 15:03:34 +0100 Subject: [PATCH 1/3] vxlan --- .../networking/multiple_subnets_in_shared_network.rst | 3 +++ source/installguide/configuration.rst | 3 +++ 2 files changed, 6 insertions(+) diff --git a/source/adminguide/networking/multiple_subnets_in_shared_network.rst b/source/adminguide/networking/multiple_subnets_in_shared_network.rst index bd7087f723..e5a5c7109e 100644 --- a/source/adminguide/networking/multiple_subnets_in_shared_network.rst +++ b/source/adminguide/networking/multiple_subnets_in_shared_network.rst @@ -95,6 +95,9 @@ Adding Multiple Subnets to a Shared Network defaulted to the vlan of the network or if vlan of the network is null - to Untagged + .. NOTE if the VNI is of a VXLan, the potocol prefix `vxlan://` + must be used, like in `vxlan://` + #. Click OK. diff --git a/source/installguide/configuration.rst b/source/installguide/configuration.rst index 86cdda1742..24b8280808 100644 --- a/source/installguide/configuration.rst +++ b/source/installguide/configuration.rst @@ -637,6 +637,9 @@ Core Zone - **VLAN / VNI ID.** The VLAN / VNI ID's that will be used for guest traffic. + .. NOTE if the VNI is of a VXLan, the potocol prefix + `vxlan://` must be used, like in `vxlan://` + #. In a new pod, CloudStack adds the first cluster for you. You can always add more clusters later. For an overview of what a cluster is, see :ref:`about-clusters` From 42646ea3e6d2955325656e5a53150993681afa9e Mon Sep 17 00:00:00 2001 From: dahn Date: Mon, 30 Dec 2024 15:25:42 +0100 Subject: [PATCH 2/3] spelling Co-authored-by: Pearl Dsilva --- .../networking/multiple_subnets_in_shared_network.rst | 2 +- source/installguide/configuration.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/adminguide/networking/multiple_subnets_in_shared_network.rst b/source/adminguide/networking/multiple_subnets_in_shared_network.rst index e5a5c7109e..f19c92cf1b 100644 --- a/source/adminguide/networking/multiple_subnets_in_shared_network.rst +++ b/source/adminguide/networking/multiple_subnets_in_shared_network.rst @@ -95,7 +95,7 @@ Adding Multiple Subnets to a Shared Network defaulted to the vlan of the network or if vlan of the network is null - to Untagged - .. NOTE if the VNI is of a VXLan, the potocol prefix `vxlan://` + .. NOTE if the VNI is of a VXLAN, the protocol prefix `vxlan://` must be used, like in `vxlan://` #. Click OK. diff --git a/source/installguide/configuration.rst b/source/installguide/configuration.rst index 24b8280808..165e44db0a 100644 --- a/source/installguide/configuration.rst +++ b/source/installguide/configuration.rst @@ -637,7 +637,7 @@ Core Zone - **VLAN / VNI ID.** The VLAN / VNI ID's that will be used for guest traffic. - .. NOTE if the VNI is of a VXLan, the potocol prefix + .. NOTE if the VNI is of a VXLAN, the protocol prefix `vxlan://` must be used, like in `vxlan://` #. In a new pod, CloudStack adds the first cluster for you. You can From 7a8b378d69028a2c30cdc16d48386fab0632c8c2 Mon Sep 17 00:00:00 2001 From: dahn Date: Mon, 30 Dec 2024 15:57:17 +0100 Subject: [PATCH 3/3] Apply suggestions from code review --- .../networking/multiple_subnets_in_shared_network.rst | 3 +-- source/installguide/configuration.rst | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/source/adminguide/networking/multiple_subnets_in_shared_network.rst b/source/adminguide/networking/multiple_subnets_in_shared_network.rst index f19c92cf1b..07936f0432 100644 --- a/source/adminguide/networking/multiple_subnets_in_shared_network.rst +++ b/source/adminguide/networking/multiple_subnets_in_shared_network.rst @@ -95,8 +95,7 @@ Adding Multiple Subnets to a Shared Network defaulted to the vlan of the network or if vlan of the network is null - to Untagged - .. NOTE if the VNI is of a VXLAN, the protocol prefix `vxlan://` - must be used, like in `vxlan://` +.. note:: If the VNI is of a VXLAN, the protocol prefix `vxlan://` must be used, like in `vxlan://` #. Click OK. diff --git a/source/installguide/configuration.rst b/source/installguide/configuration.rst index 165e44db0a..5d11da5916 100644 --- a/source/installguide/configuration.rst +++ b/source/installguide/configuration.rst @@ -637,8 +637,7 @@ Core Zone - **VLAN / VNI ID.** The VLAN / VNI ID's that will be used for guest traffic. - .. NOTE if the VNI is of a VXLAN, the protocol prefix - `vxlan://` must be used, like in `vxlan://` +.. note:: If the VNI is of a VXLAN, the protocol prefix `vxlan://` must be used, like in `vxlan://` #. In a new pod, CloudStack adds the first cluster for you. You can always add more clusters later. For an overview of what a cluster is,