From 7a0e8c11728e7c27b0c6b106d57dd24b118bcecd Mon Sep 17 00:00:00 2001 From: Ron Stone Date: Mon, 11 Apr 2022 09:06:59 -0400 Subject: [PATCH] Hardware Requirements in StarlingX (r6,r5) Provide inline access to referenced diagrams. Closes-Bug: 1906630 Signed-off-by: Ron Stone Change-Id: Ic09cfcb38ca060c2e60cf468fa78f183592f580e --- .../r6_release/bare_metal/aio_duplex_hardware.rst | 13 ++++++++++++- .../r6_release/bare_metal/aio_simplex_hardware.rst | 11 +++++++++++ .../bare_metal/controller_storage_hardware.rst | 13 ++++++++++++- .../bare_metal/dedicated_storage_hardware.rst | 13 ++++++++++++- .../r6_release/bare_metal/prep_servers.txt | 7 +------ .../r6_release/bare_metal/rook_storage_hardware.rst | 11 +++++++++++ doc/source/shared/_includes/desc_aio_simplex.txt | 3 +-- 7 files changed, 60 insertions(+), 11 deletions(-) diff --git a/doc/source/deploy_install_guides/r6_release/bare_metal/aio_duplex_hardware.rst b/doc/source/deploy_install_guides/r6_release/bare_metal/aio_duplex_hardware.rst index a5f99b997..009a995bd 100644 --- a/doc/source/deploy_install_guides/r6_release/bare_metal/aio_duplex_hardware.rst +++ b/doc/source/deploy_install_guides/r6_release/bare_metal/aio_duplex_hardware.rst @@ -55,4 +55,15 @@ host types are: Prepare bare metal servers -------------------------- -.. include:: prep_servers.txt \ No newline at end of file +.. 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* \ No newline at end of file diff --git a/doc/source/deploy_install_guides/r6_release/bare_metal/aio_simplex_hardware.rst b/doc/source/deploy_install_guides/r6_release/bare_metal/aio_simplex_hardware.rst index 3e214279f..6ed3f6511 100644 --- a/doc/source/deploy_install_guides/r6_release/bare_metal/aio_simplex_hardware.rst +++ b/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* \ No newline at end of file diff --git a/doc/source/deploy_install_guides/r6_release/bare_metal/controller_storage_hardware.rst b/doc/source/deploy_install_guides/r6_release/bare_metal/controller_storage_hardware.rst index 47c6c6b5c..b4dc1b059 100644 --- a/doc/source/deploy_install_guides/r6_release/bare_metal/controller_storage_hardware.rst +++ b/doc/source/deploy_install_guides/r6_release/bare_metal/controller_storage_hardware.rst @@ -53,4 +53,15 @@ host types are: Prepare bare metal servers -------------------------- -.. include:: prep_servers.txt \ No newline at end of file +.. 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* diff --git a/doc/source/deploy_install_guides/r6_release/bare_metal/dedicated_storage_hardware.rst b/doc/source/deploy_install_guides/r6_release/bare_metal/dedicated_storage_hardware.rst index 2a80e4fc0..ffac52bbf 100644 --- a/doc/source/deploy_install_guides/r6_release/bare_metal/dedicated_storage_hardware.rst +++ b/doc/source/deploy_install_guides/r6_release/bare_metal/dedicated_storage_hardware.rst @@ -58,4 +58,15 @@ host types are: Prepare bare metal servers -------------------------- -.. include:: prep_servers.txt \ No newline at end of file +.. 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* \ No newline at end of file diff --git a/doc/source/deploy_install_guides/r6_release/bare_metal/prep_servers.txt b/doc/source/deploy_install_guides/r6_release/bare_metal/prep_servers.txt index 61a686201..e4faacf75 100644 --- a/doc/source/deploy_install_guides/r6_release/bare_metal/prep_servers.txt +++ b/doc/source/deploy_install_guides/r6_release/bare_metal/prep_servers.txt @@ -5,13 +5,8 @@ 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) -* Powered off \ No newline at end of file +* Powered off diff --git a/doc/source/deploy_install_guides/r6_release/bare_metal/rook_storage_hardware.rst b/doc/source/deploy_install_guides/r6_release/bare_metal/rook_storage_hardware.rst index 82a26815b..8bea97547 100644 --- a/doc/source/deploy_install_guides/r6_release/bare_metal/rook_storage_hardware.rst +++ b/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* \ No newline at end of file diff --git a/doc/source/shared/_includes/desc_aio_simplex.txt b/doc/source/shared/_includes/desc_aio_simplex.txt index 41ac5172b..6336761c6 100644 --- a/doc/source/shared/_includes/desc_aio_simplex.txt +++ b/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 - details. + settings. Refer to :ref:`docker_proxy_config` for details. .. figure:: /deploy_install_guides/r6_release/figures/starlingx-deployment-options-simplex.png :scale: 50%