Skip to content

Commit

Permalink
Merge branch '4.18' into 4.19
Browse files Browse the repository at this point in the history
  • Loading branch information
DaanHoogland committed Apr 8, 2024
2 parents 5a47bef + 2cee719 commit 7f8c887
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
9 changes: 9 additions & 0 deletions source/installguide/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,9 @@ Basic Zone Configuration
#. In a new zone, CloudStack adds the first pod for you. You can always
add more pods later. For an overview of what a pod is, see :ref:`about-pods`

.. note::
The network described below must be a subnet of the physical network marked as type "management".

To configure the first pod, enter the following, then click Next:

- **Pod Name.** A name for the pod.
Expand Down Expand Up @@ -602,6 +605,9 @@ Core Zone
#. In a new zone, CloudStack adds the first pod for you. You can always
add more pods later. For an overview of what a pod is, see :ref:`about-pods`

.. note::
The network described below must be a subnet of the physical network marked as type "management".

To configure the first pod, enter the following, then click Next:

- **Pod Name.** (Obligatory) A name for the pod.
Expand Down Expand Up @@ -850,6 +856,9 @@ can add more pods at any time using the procedure in this section.
Secondary Storage VMs, Console Proxy VMs, and DHCP. For more
information, see System Reserved IP Addresses.

.. note::
* The network described above must be a subnet of the management network.

#. Click OK.


Expand Down
3 changes: 3 additions & 0 deletions source/quickinstallationguide/qig.rst
Original file line number Diff line number Diff line change
Expand Up @@ -730,6 +730,9 @@ will assign IPs from this range to system VMs. This will also be part of our loc

#. End Reserved system IP - we will use ``172.16.10.30`` # (or e.g. 192.168.1.30)

.. note::
* The network described above must be a subnet of the management network.

Click "Next" to continue.

Guest Traffic
Expand Down

0 comments on commit 7f8c887

Please sign in to comment.