Merge "Hardware Requirements in StarlingX (r6,r5)"

doc/source/deploy_install_guides/r6_release/bare_metal/aio_duplex_hardware.rst

@@ -56,3 +56,14 @@ Prepare bare metal servers
 --------------------------
 
 .. include:: prep_servers.txt
+
+* Cabled for networking
+
+  * Far-end switch ports should be properly configured to realize the networking
+    shown in the following diagram.
+
+    .. figure:: /deploy_install_guides/r6_release/figures/starlingx-deployment-options-duplex.png
+       :scale: 50%
+       :alt: All-in-one Duplex deployment configuration
+
+       *All-in-one Duplex deployment configuration*

doc/source/deploy_install_guides/r6_release/bare_metal/aio_simplex_hardware.rst

@@ -58,3 +58,14 @@ Prepare bare metal servers
 --------------------------
 
 .. include:: prep_servers.txt
+
+* Cabled for networking
+
+  * Far-end switch ports should be properly configured to realize the networking
+    shown in the following diagram.
+
+    .. figure:: /deploy_install_guides/r6_release/figures/starlingx-deployment-options-simplex.png
+       :scale: 50%
+       :alt: All-in-one Simplex deployment configuration
+
+       *All-in-one Simplex deployment configuration*

doc/source/deploy_install_guides/r6_release/bare_metal/controller_storage_hardware.rst

@@ -54,3 +54,14 @@ Prepare bare metal servers
 --------------------------
 
 .. include:: prep_servers.txt
+
+* Cabled for networking
+
+  * Far-end switch ports should be properly configured to realize the networking
+    shown in the following diagram.
+
+    .. figure:: /deploy_install_guides/r6_release/figures/starlingx-deployment-options-controller-storage.png
+       :scale: 50%
+       :alt: Controller storage deployment configuration
+
+       *Controller storage deployment configuration*

doc/source/deploy_install_guides/r6_release/bare_metal/dedicated_storage_hardware.rst

@@ -59,3 +59,14 @@ Prepare bare metal servers
 --------------------------
 
 .. include:: prep_servers.txt
+
+* Cabled for networking
+
+  * Far-end switch ports should be properly configured to realize the networking
+    shown in the following diagram.
+
+    .. figure:: /deploy_install_guides/r6_release/figures/starlingx-deployment-options-dedicated-storage.png
+       :scale: 50%
+       :alt: Standard with dedicated storage
+
+       *Standard with dedicated storage*

doc/source/deploy_install_guides/r6_release/bare_metal/prep_servers.txt

@@ -5,11 +5,6 @@ the following condition:
 
 * Cabled for power
 
-* Cabled for networking
-
-  * Far-end switch ports should be properly configured to realize the networking
-    shown in Figure 1.
-
 * All disks wiped
 
   * Ensures that servers will boot from either the network or USB storage (if present)

doc/source/deploy_install_guides/r6_release/bare_metal/rook_storage_hardware.rst

@@ -60,3 +60,14 @@ Prepare bare metal servers
 --------------------------
 
 .. include:: prep_servers.txt
+
+* Cabled for networking
+
+  * Far-end switch ports should be properly configured to realize the networking
+    shown in the following diagram.
+
+    .. figure:: /deploy_install_guides/r6_release/figures/starlingx-deployment-options-controller-storage.png
+       :scale: 50%
+       :alt: Standard with Rook Storage deployment configuration
+
+       *Standard with Rook Storage deployment configuration*

doc/source/shared/_includes/desc_aio_simplex.txt

@@ -10,8 +10,7 @@ following benefits:
 .. note::
 
    If you are behind a corporate firewall or proxy, you need to set proxy
-   settings. Refer to :ref:`docker_proxy_config` for
+   settings. Refer to :ref:`docker_proxy_config` for details.
-   details.
 
 .. figure:: /deploy_install_guides/r6_release/figures/starlingx-deployment-options-simplex.png
    :scale: 50%