Fix table (r9, dsr8MR3, dsr8MR2)

Add declaration and indent as block.

Fixes: https://review.opendev.org/c/starlingx/docs/+/903075

Change-Id: Ib6f034addc73a4eea990eca000ec75f4af7227fb
Signed-off-by: Ron Stone <ronald.stone@windriver.com>
This commit is contained in:
Ron Stone 2024-03-22 17:42:09 +00:00 committed by Juanita-Balaraj
parent da8043d782
commit f7f89d204e
1 changed files with 89 additions and 86 deletions

View File

@ -524,92 +524,95 @@ The table below lists the operations that can/cannot be performed on the protect
**Local/Unprotected subcloud**: The subcloud that does not belong to any |SPG|. **Local/Unprotected subcloud**: The subcloud that does not belong to any |SPG|.
+------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+ .. table::
| Operation | Allow (Y/N/Maybe) | Note | :widths: auto
+==========================================+==================================+=================================================================================================+
| Unmanage | N | Subcloud must be removed from the |SPG| before it can be manually unmanaged. | +------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+
+------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+ | Operation | Allow (Y/N/Maybe) | Note |
| Manage | N | Subcloud must be removed from the |SPG| before it can be manually managed. | +==========================================+==================================+=================================================================================================+
+------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+ | Unmanage | N | Subcloud must be removed from the |SPG| before it can be manually unmanaged. |
| Delete | N | Subcloud must be removed from the |SPG| before it can be manually unmanaged | +------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+
| | | and deleted. | | Manage | N | Subcloud must be removed from the |SPG| before it can be manually managed. |
+------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+ +------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+
| Update | Maybe | Subcloud can only be updated while it is managed in the primary site because the sync command | | Delete | N | Subcloud must be removed from the |SPG| before it can be manually unmanaged |
| | | can only be issued from the system controller where the |SPG| was created. | | | | and deleted. |
| | | | +------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+
| | | .. warning:: | | Update | Maybe | Subcloud can only be updated while it is managed in the primary site because the sync command |
| | | | | | | can only be issued from the system controller where the |SPG| was created. |
| | | The subcloud network cannot be reconfigured while it is being managed by the secondary | | | | |
| | | site. If this operation is necessary, perform the following steps: | | | | .. warning:: |
| | | | | | | |
| | | #. Remove the subcloud from the |SPG| to make it a local/unprotected | | | | The subcloud network cannot be reconfigured while it is being managed by the secondary |
| | | subcloud. | | | | site. If this operation is necessary, perform the following steps: |
| | | #. Update the subcloud. | | | | |
| | | #. (Optional) Manually rehome the subcloud to the primary site after it is restored. | | | | #. Remove the subcloud from the |SPG| to make it a local/unprotected |
| | | #. (Optional) Re-add the subcloud to the |SPG|. | | | | subcloud. |
+------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+ | | | #. Update the subcloud. |
| Rename | Yes | - If the subcloud in the primary site is already a part of |SPG|, we need to remove it from the | | | | #. (Optional) Manually rehome the subcloud to the primary site after it is restored. |
| | | |SPG| and then unmanage, rename, and manage the subcloud, and add it back to |SPG| and perform| | | | #. (Optional) Re-add the subcloud to the |SPG|. |
| | | the sync operation. | +------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+
| | | | | Rename | Yes | - If the subcloud in the primary site is already a part of |SPG|, we need to remove it from the |
| | | - If the subcloud is in the secondary site, perform the following steps: | | | | |SPG| and then unmanage, rename, and manage the subcloud, and add it back to |SPG| and perform|
| | | | | | | the sync operation. |
| | | #. Remove the subcloud from the |SPG| to make it a local/unprotected subcloud. | | | | |
| | | | | | | - If the subcloud is in the secondary site, perform the following steps: |
| | | #. Unmange the subcloud. | | | | |
| | | | | | | #. Remove the subcloud from the |SPG| to make it a local/unprotected subcloud. |
| | | #. Rename the subcloud. | | | | |
| | | | | | | #. Unmange the subcloud. |
| | | #. (Optional) Manually rehome the subcloud to the primary site after it is restored. | | | | |
| | | | | | | #. Rename the subcloud. |
| | | #. (Optional) Re-add the subcloud to the |SPG|. | | | | |
+------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+ | | | #. (Optional) Manually rehome the subcloud to the primary site after it is restored. |
| Patch | Y | .. warning:: | | | | |
| | | | | | | #. (Optional) Re-add the subcloud to the |SPG|. |
| | | There may be a patch out-of-sync alarm when the subcloud is migrated to another site. | +------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+
+------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+ | Patch | Y | .. warning:: |
| Upgrade | Y | All the system controllers in the protection group must be upgraded first before upgrading | | | | |
| | | any of the subclouds. | | | | There may be a patch out-of-sync alarm when the subcloud is migrated to another site. |
+------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+ +------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+
| Rehome | N | Subcloud cannot be manually rehomed while being part of the |SPG| | | Upgrade | Y | All the system controllers in the protection group must be upgraded first before upgrading |
+------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+ | | | any of the subclouds. |
| Backup | Y | | +------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+
| | | | | Rehome | N | Subcloud cannot be manually rehomed while being part of the |SPG| |
+------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+ +------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+
| Restore | Maybe | - If the subcloud in the primary site is already a part of |SPG|, we need to remove it from the | | Backup | Y | |
| | | |SPG| and then unmanage and restore the subcloud, and add it back to |SPG| and perform | | | | |
| | | the sync operation. | +------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+
| | | | | Restore | Maybe | - If the subcloud in the primary site is already a part of |SPG|, we need to remove it from the |
| | | - If the subcloud is in the secondary site, perform the following steps: | | | | |SPG| and then unmanage and restore the subcloud, and add it back to |SPG| and perform |
| | | | | | | the sync operation. |
| | | #. Remove the subcloud from the |SPG| to make it a local/unprotected subcloud. | | | | |
| | | | | | | - If the subcloud is in the secondary site, perform the following steps: |
| | | #. Unmange the subcloud. | | | | |
| | | | | | | #. Remove the subcloud from the |SPG| to make it a local/unprotected subcloud. |
| | | #. Restore the subcloud from the backup. | | | | |
| | | | | | | #. Unmange the subcloud. |
| | | #. (Optional) Manually rehome the subcloud to the primary site after it is restored. | | | | |
| | | | | | | #. Restore the subcloud from the backup. |
| | | #. (Optional) Re-add the subcloud to the |SPG|. | | | | |
+------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+ | | | #. (Optional) Manually rehome the subcloud to the primary site after it is restored. |
| Prestage | Y | .. warning:: | | | | |
| | | | | | | #. (Optional) Re-add the subcloud to the |SPG|. |
| | | The prestage data will get overwritten because it is not guaranteed that both the system | +------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+
| | | controllers always run on the same patch level (ostree repo) and/or have the same images | | Prestage | Y | .. warning:: |
| | | list. | | | | |
| | | | | | | The prestage data will get overwritten because it is not guaranteed that both the system |
+------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+ | | | controllers always run on the same patch level (ostree repo) and/or have the same images |
| Reinstall | Y | | | | | list. |
| | | | | | | |
+------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+ +------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+
| Remove from |SPG| | Maybe | Subcloud can be removed from the |SPG| in the primary site. Subcloud can | | Reinstall | Y | |
| | | only be removed from the |SPG| in the secondary site if the primary site is | | | | |
| | | currently down. | +------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+
+------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+ | Remove from |SPG| | Maybe | Subcloud can be removed from the |SPG| in the primary site. Subcloud can |
| Add to |SPG| | Maybe | Subcloud can only be added to the |SPG| in the primary site as manual sync is required. | | | | only be removed from the |SPG| in the secondary site if the primary site is |
| | | | | | | currently down. |
| | | | +------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+
+------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+ | Add to |SPG| | Maybe | Subcloud can only be added to the |SPG| in the primary site as manual sync is required. |
| | | |
| | | |
+------------------------------------------+----------------------------------+-------------------------------------------------------------------------------------------------+