From c12cf2bc59c5b952f3279ffeb068d7723344d0fb Mon Sep 17 00:00:00 2001 From: egoncalv Date: Mon, 14 Jun 2021 15:02:19 -0300 Subject: [PATCH] Replaced relase version to nn.nn Solved building and merge conflict problem. Signed-off-by: egoncalv Change-Id: I9272fa6246bd60ace6a5f7ba64fdb4181b1e4721 --- ...ring-starlingx-system-data-and-storage.rst | 10 ++--- doc/source/deploy/deploy-edgeworker-nodes.rst | 2 +- .../stx_ipv6_deployment.rst | 2 +- .../dist_cloud/creating-subcloud-groups.rst | 2 +- .../managing-subclouds-using-the-cli.rst | 4 +- ...us-for-distributed-cloud-using-the-cli.rst | 12 +++--- ...tarlingx-rest-and-web-server-endpoints.rst | 2 +- .../changing-the-timezone-configuration.rst | 2 +- ...ntp-servers-and-services-using-the-cli.rst | 4 +- .../configuring-ptp-service-using-the-cli.rst | 4 +- ...version-and-update-level-using-the-cli.rst | 2 +- ...service-software-updates-using-the-cli.rst | 36 +++++++++--------- ...equired-software-updates-using-the-cli.rst | 38 +++++++++---------- ...oving-reboot-required-software-updates.rst | 12 +++--- .../update-status-and-lifecycle.rst | 16 ++++---- ...pgrading-all-in-one-duplex-or-standard.rst | 2 - .../upgrading-all-in-one-simplex.rst | 1 - 17 files changed, 74 insertions(+), 77 deletions(-) diff --git a/doc/source/backup/kubernetes/restoring-starlingx-system-data-and-storage.rst b/doc/source/backup/kubernetes/restoring-starlingx-system-data-and-storage.rst index 35313a9c0..836f89db6 100644 --- a/doc/source/backup/kubernetes/restoring-starlingx-system-data-and-storage.rst +++ b/doc/source/backup/kubernetes/restoring-starlingx-system-data-and-storage.rst @@ -153,11 +153,11 @@ conditions are in place: .. code-block:: none $ sudo sw-patch query - Patch ID RR Release Patch State - ======================== ========== =========== - COMPUTECONFIG Available 20.06 n/a - LIBCUNIT_CONTROLLER_ONLY Applied 20.06 n/a - STORAGECONFIG Applied 20.06 n/a + Patch ID RR Release Patch State + ======================== ========== ======= =========== + COMPUTECONFIG Available nn.nn n/a + LIBCUNIT_CONTROLLER_ONLY Applied nn.nn n/a + STORAGECONFIG Applied nn.nn n/a Rerun the Ansible Playbook if there were patches applied and you were prompted to reboot the system. diff --git a/doc/source/deploy/deploy-edgeworker-nodes.rst b/doc/source/deploy/deploy-edgeworker-nodes.rst index 09a841a63..b3394d29f 100644 --- a/doc/source/deploy/deploy-edgeworker-nodes.rst +++ b/doc/source/deploy/deploy-edgeworker-nodes.rst @@ -138,7 +138,7 @@ inventory (with personality set to None). | reserved | False | | rootfs_device | /dev/sda | | serialid | None | - | software_load | 20.12 | + | software_load | nn.nn | | task | None | | tboot | false | | ttys_dcd | None | diff --git a/doc/source/developer_resources/stx_ipv6_deployment.rst b/doc/source/developer_resources/stx_ipv6_deployment.rst index 4e4ff7b37..e98061401 100644 --- a/doc/source/developer_resources/stx_ipv6_deployment.rst +++ b/doc/source/developer_resources/stx_ipv6_deployment.rst @@ -469,7 +469,7 @@ reference. | sdn_enabled | False | | security_feature | spectre_meltdown_v1 | | service_project_name | services | - | software_version | 20.01 | + | software_version | nn.nn | | system_mode | duplex | | system_type | All-in-one | | timezone | UTC | diff --git a/doc/source/dist_cloud/creating-subcloud-groups.rst b/doc/source/dist_cloud/creating-subcloud-groups.rst index e8ae5f228..3fab07d90 100644 --- a/doc/source/dist_cloud/creating-subcloud-groups.rst +++ b/doc/source/dist_cloud/creating-subcloud-groups.rst @@ -168,7 +168,7 @@ Deletes subcloud group details from the database. | name | Subcloud1 | | description | Subcloud1 | | location | somewhere | - | software_version | 20.06 | + | software_version | nn.nn | | management | managed | | availability | online | | deploy_status | complete | diff --git a/doc/source/dist_cloud/managing-subclouds-using-the-cli.rst b/doc/source/dist_cloud/managing-subclouds-using-the-cli.rst index 6e447ef73..22785d431 100644 --- a/doc/source/dist_cloud/managing-subclouds-using-the-cli.rst +++ b/doc/source/dist_cloud/managing-subclouds-using-the-cli.rst @@ -49,7 +49,7 @@ fails, delete subclouds, and monitor or change the managed status of subclouds. | name | subcloud2 | | description | subcloud2 description | | location | subcloud 2 location | - | software_version | 20.06 | + | software_version | nn.nn | | management | managed | | availability | online | | deploy_status | complete | @@ -82,7 +82,7 @@ fails, delete subclouds, and monitor or change the managed status of subclouds. | name | subcloud2 | | description | subcloud2 description | | location | subcloud 2 location | - | software_version | 20.06 | + | software_version | nn.nn | | management | managed | | availability | online | | deploy_status | complete | diff --git a/doc/source/dist_cloud/reviewing-update-status-for-distributed-cloud-using-the-cli.rst b/doc/source/dist_cloud/reviewing-update-status-for-distributed-cloud-using-the-cli.rst index 3fa23c40a..e490c785f 100644 --- a/doc/source/dist_cloud/reviewing-update-status-for-distributed-cloud-using-the-cli.rst +++ b/doc/source/dist_cloud/reviewing-update-status-for-distributed-cloud-using-the-cli.rst @@ -29,11 +29,11 @@ Distributed Cloud Using Horizon ~(keystone_admin)]$ sw-patch --os-region-name SystemController query Patch ID RR Release Patch State =================== == ======= =========== - wrcp_nn.nn_PATCH_0001 N 20.06 Applied - wrcp_nn.nn_PATCH_0002 N 20.06 Applied - wrcp_nn.nn_PATCH_0003 N 20.06 Partial - wrcp_nn.nn_PATCH_0004 N 20.06 Available - wrcp_nn.nn_PATCH_0005 N 20.06 Available + wrcp_nn.nn_PATCH_0001 N nn.nn Applied + wrcp_nn.nn_PATCH_0002 N nn.nn Applied + wrcp_nn.nn_PATCH_0003 N nn.nn Partial + wrcp_nn.nn_PATCH_0004 N nn.nn Available + wrcp_nn.nn_PATCH_0005 N nn.nn Available The **Patch State** column indicates whether the Patch is available, partially-applied or applied. **Applied** indicates that the update has @@ -71,7 +71,7 @@ Distributed Cloud Using Horizon | name | subcloud1 | | description | None | | location | None | - | software_version | 20.06 | + | software_version | nn.nn | | management | managed | | availability | online | | deploy_status | complete | diff --git a/doc/source/security/kubernetes/enable-https-access-for-starlingx-rest-and-web-server-endpoints.rst b/doc/source/security/kubernetes/enable-https-access-for-starlingx-rest-and-web-server-endpoints.rst index 9493a0208..b489a7687 100644 --- a/doc/source/security/kubernetes/enable-https-access-for-starlingx-rest-and-web-server-endpoints.rst +++ b/doc/source/security/kubernetes/enable-https-access-for-starlingx-rest-and-web-server-endpoints.rst @@ -62,7 +62,7 @@ When secure HTTPS connectivity is enabled, HTTP is disabled. | sdn_enabled | False | | security_feature | spectre_meltdown_v1 | | service_project_name | services | - | software_version | 20.06 | + | software_version | nn.nn | | system_mode | duplex | | system_type | Standard | | timezone | Canada/Eastern | diff --git a/doc/source/system_configuration/kubernetes/changing-the-timezone-configuration.rst b/doc/source/system_configuration/kubernetes/changing-the-timezone-configuration.rst index f1dae8996..581cadd31 100644 --- a/doc/source/system_configuration/kubernetes/changing-the-timezone-configuration.rst +++ b/doc/source/system_configuration/kubernetes/changing-the-timezone-configuration.rst @@ -31,7 +31,7 @@ You can use the CLI to view and change the timezone configuration. | sdn_enabled | False | | security_feature | spectre_meltdown_v1 | | service_project_name | services | - | software_version | 20.06 | + | software_version | nn.nn | | system_mode | duplex | | system_type | Standard | | timezone | Canada/Eastern | diff --git a/doc/source/system_configuration/kubernetes/configuring-ntp-servers-and-services-using-the-cli.rst b/doc/source/system_configuration/kubernetes/configuring-ntp-servers-and-services-using-the-cli.rst index d97ca4049..442ead921 100644 --- a/doc/source/system_configuration/kubernetes/configuring-ntp-servers-and-services-using-the-cli.rst +++ b/doc/source/system_configuration/kubernetes/configuring-ntp-servers-and-services-using-the-cli.rst @@ -96,7 +96,7 @@ Use the following command to change the clock synchronization on the host: | reserved | False | | rootfs_device | /dev/disk/by-path/pci-0000:00:1f.2-ata-1.0 | | serialid | None | - | software_load | 20.06 | + | software_load | nn.nn | | subfunction_avail | available | | subfunction_oper | enabled | | subfunctions | controller,worker | @@ -149,7 +149,7 @@ To view the |NTP| service configuration, use the following command: | rootfs_device | /dev/disk/by-path/pci-0000:04:00.0-sas | | | -0x5001e6754aa38000-lun-0 | | serialid | None | - | software_load | 20.06 | + | software_load | nn.nn | | task | | | tboot | false | | ttys_dcd | None | diff --git a/doc/source/system_configuration/kubernetes/configuring-ptp-service-using-the-cli.rst b/doc/source/system_configuration/kubernetes/configuring-ptp-service-using-the-cli.rst index 4356bd83b..c2536bdef 100644 --- a/doc/source/system_configuration/kubernetes/configuring-ptp-service-using-the-cli.rst +++ b/doc/source/system_configuration/kubernetes/configuring-ptp-service-using-the-cli.rst @@ -86,7 +86,7 @@ and |PTP| are configured per host. Lock/unlock the host when updating. | rootfs_device | /dev/disk/by-path/pci-0000:04:00.0 | | | -sas-0x5001e6754aa38000-lun-0 | | serialid | None | - | software_load | 20.06 | + | software_load | nn.nn | | task | | | tboot | false | | ttys_dcd | None | @@ -136,7 +136,7 @@ To view the |PTP| service configuration, use the following command: | rootfs_device | /dev/disk/by-path/pci-0000:04:00.0-sas | | | -0x5001e6754aa38000-lun-0 | | serialid | None | - | software_load | 20.06 | + | software_load | nn.nn | | task | | | tboot | false | | ttys_dcd | None | diff --git a/doc/source/updates/kubernetes/identifying-the-software-version-and-update-level-using-the-cli.rst b/doc/source/updates/kubernetes/identifying-the-software-version-and-update-level-using-the-cli.rst index 8acae841c..118ee4218 100644 --- a/doc/source/updates/kubernetes/identifying-the-software-version-and-update-level-using-the-cli.rst +++ b/doc/source/updates/kubernetes/identifying-the-software-version-and-update-level-using-the-cli.rst @@ -37,7 +37,7 @@ For more about working with software updates, see :ref:`Manage Software Updates | sdn_enabled | False | | security_feature | spectre_meltdown_v1 | | service_project_name | services | - | software_version | 20.06 | + | software_version | nn.nn | | system_mode | duplex | | system_type | Standard | | timezone | UTC | diff --git a/doc/source/updates/kubernetes/installing-in-service-software-updates-using-the-cli.rst b/doc/source/updates/kubernetes/installing-in-service-software-updates-using-the-cli.rst index 3f62cede5..2b1c550e6 100644 --- a/doc/source/updates/kubernetes/installing-in-service-software-updates-using-the-cli.rst +++ b/doc/source/updates/kubernetes/installing-in-service-software-updates-using-the-cli.rst @@ -26,7 +26,7 @@ unlocked as part of applying the update. $ sudo sw-patch query Patch ID RR Release Patch State ==================== == ======= =========== - INSVC_HORIZON_SYSINV N 20.04 Available + INSVC_HORIZON_SYSINV N nn.nn Available #. Check the status of the hosts. @@ -35,9 +35,9 @@ unlocked as part of applying the update. $ sudo sw-patch query-hosts Hostname IP Address Patch Current Reboot Required Release State ============ ============== ============= =============== ======= ===== - worker-0 192.168.204.24 Yes No 20.01 idle - controller-0 192.168.204.3 Yes No 20.01 idle - controller-1 192.168.204.4 Yes No 20.01 idle + worker-0 192.168.204.24 Yes No nn.nn idle + controller-0 192.168.204.3 Yes No nn.nn idle + controller-1 192.168.204.4 Yes No nn.nn idle #. Ensure the original update files have been deleted from the root drive. @@ -67,7 +67,7 @@ unlocked as part of applying the update. $ sudo sw-patch query Patch ID RR Release Patch State ==================== == ======= ============= - INSVC_HORIZON_SYSINV N 20.04 Partial-Apply + INSVC_HORIZON_SYSINV N nn.nn Partial-Apply As it is an in-service update, the hosts report that they are not 'patch current', but they do not require a reboot. @@ -77,10 +77,10 @@ unlocked as part of applying the update. $ sudo sw-patch query-hosts Hostname IP Address Patch Current Reboot Required Release State ============ ============== ============= =============== ======= ===== - worker-0 192.168.204.24 No No 20.04 idle - controller-0 192.168.204.3 No No 20.04 idle - controller-1 192.168.204.4 No No 20.04 idle - + worker-0 192.168.204.24 No No nn.nn idle + controller-0 192.168.204.3 No No nn.nn idle + controller-1 192.168.204.4 No No nn.nn idle + #. Install the update on controller-0. @@ -97,9 +97,9 @@ unlocked as part of applying the update. $ sudo sw-patch query-hosts Hostname IP Address Patch Current Reboot Required Release State ============ ============== ============= =============== ======= ===== - worker-0 192.168.204.24 No No 20.01 idle - controller-0 192.168.204.3 Yes No 20.01 idle - controller-1 192.168.204.4 No No 20.01 idle + worker-0 192.168.204.24 No No nn.nn idle + controller-0 192.168.204.3 Yes No nn.nn idle + controller-1 192.168.204.4 No No nn.nn idle The controller-1 host reports it is now 'patch current' and does not require a reboot, without having been locked or rebooted @@ -119,13 +119,13 @@ unlocked as part of applying the update. .. code-block:: none $ sudo sw-patch query-hosts - Hostname IP Address Patch Current Reboot Required Release State + Hostname IP Address Patch Current Reboot Required Release State ============ ============== ============= =============== ======= ===== - worker-0 192.168.204.24 Yes No 20.04 idle - controller-0 192.168.204.3 Yes No 20.04 idle - controller-1 192.168.204.4 Yes No 20.04 idle - + worker-0 192.168.204.24 Yes No nn.nn idle + controller-0 192.168.204.3 Yes No nn.nn idle + controller-1 192.168.204.4 Yes No nn.nn idle + $ sudo sw-patch query Patch ID RR Release Patch State ==================== == ======= =========== - INSVC_HORIZON_SYSINV N 20.04 Applied + INSVC_HORIZON_SYSINV N nn.nn Applied diff --git a/doc/source/updates/kubernetes/installing-reboot-required-software-updates-using-the-cli.rst b/doc/source/updates/kubernetes/installing-reboot-required-software-updates-using-the-cli.rst index f9494e5dd..2f48a9c44 100644 --- a/doc/source/updates/kubernetes/installing-reboot-required-software-updates-using-the-cli.rst +++ b/doc/source/updates/kubernetes/installing-reboot-required-software-updates-using-the-cli.rst @@ -85,9 +85,9 @@ You can install reboot-required software updates using the CLI. Hostname IP Address Patch Current Reboot Required Release State ============ ============== ============= =============== ======= ===== - worker-0 192.168.204.12 Yes No 20.04 idle - controller-0 192.168.204.3 Yes Yes 20.04 idle - controller-1 192.168.204.4 Yes Yes 20.04 idle + worker-0 192.168.204.12 Yes No nn.nn idle + controller-0 192.168.204.3 Yes Yes nn.nn idle + controller-1 192.168.204.4 Yes Yes nn.nn idle For each host in the cluster, the following status fields are displayed: @@ -190,14 +190,14 @@ You can install reboot-required software updates using the CLI. Hostname IP Address Patch Current Reboot Required Release State ============ ============== ============= =============== ======= ===== - compute-0 192.168.204.95 Yes No 20.04 idle - compute-1 192.168.204.63 Yes No 20.04 idle - compute-2 192.168.204.99 Yes No 20.04 idle - compute-3 192.168.204.49 Yes No 20.04 idle - controller-0 192.168.204.3 Yes No 20.04 idle - controller-1 192.168.204.4 Yes No 20.04 idle - storage-0 192.168.204.37 Yes No 20.04 idle - storage-1 192.168.204.90 Yes No 20.04 idle + compute-0 192.168.204.95 Yes No nn.nn idle + compute-1 192.168.204.63 Yes No nn.nn idle + compute-2 192.168.204.99 Yes No nn.nn idle + compute-3 192.168.204.49 Yes No nn.nn idle + controller-0 192.168.204.3 Yes No nn.nn idle + controller-1 192.168.204.4 Yes No nn.nn idle + storage-0 192.168.204.37 Yes No nn.nn idle + storage-1 192.168.204.90 Yes No nn.nn idle #. Install all pending updates on **controller-1**. @@ -215,14 +215,14 @@ You can install reboot-required software updates using the CLI. Hostname IP Address Patch Current Reboot Required Release State ============ ============== ============= =============== ======= ===== - compute-0 192.168.204.95 Yes No 20.04 idle - compute-1 192.168.204.63 Yes No 20.04 idle - compute-2 192.168.204.99 Yes No 20.04 idle - compute-3 192.168.204.49 Yes No 20.04 idle - controller-0 192.168.204.3 Yes No 20.04 idle - controller-1 192.168.204.4 Yes No 20.04 idle - storage-0 192.168.204.37 Yes No 20.04 idle - storage-1 192.168.204.90 Yes No 20.04 idle + compute-0 192.168.204.95 Yes No nn.nn idle + compute-1 192.168.204.63 Yes No nn.nn idle + compute-2 192.168.204.99 Yes No nn.nn idle + compute-3 192.168.204.49 Yes No nn.nn idle + controller-0 192.168.204.3 Yes No nn.nn idle + controller-1 192.168.204.4 Yes No nn.nn idle + storage-0 192.168.204.37 Yes No nn.nn idle + storage-1 192.168.204.90 Yes No nn.nn idle #. Install any pending updates for the worker or storage hosts. diff --git a/doc/source/updates/kubernetes/removing-reboot-required-software-updates.rst b/doc/source/updates/kubernetes/removing-reboot-required-software-updates.rst index e5654187f..2ae309238 100644 --- a/doc/source/updates/kubernetes/removing-reboot-required-software-updates.rst +++ b/doc/source/updates/kubernetes/removing-reboot-required-software-updates.rst @@ -72,12 +72,12 @@ Horizon `. Hostname IP Address Patch Current Reboot Required Release State ============ =============== ============= =============== ======= ===== - compute-0 192.168.204.179 Yes No 20.04 idle - compute-1 192.168.204.173 Yes No 20.04 idle - controller-0 192.168.204.3 No No 20.04 idle - controller-1 192.168.204.4 No No 20.04 idle - storage-0 192.168.204.213 Yes No 20.04 idle - storage-1 192.168.204.181 Yes No 20.04 idle + compute-0 192.168.204.179 Yes No nn.nn idle + compute-1 192.168.204.173 Yes No nn.nn idle + controller-0 192.168.204.3 No No nn.nn idle + controller-1 192.168.204.4 No No nn.nn idle + storage-0 192.168.204.213 Yes No nn.nn idle + storage-1 192.168.204.181 Yes No nn.nn idle In this example, the controllers have updates ready to be removed, and diff --git a/doc/source/updates/kubernetes/update-status-and-lifecycle.rst b/doc/source/updates/kubernetes/update-status-and-lifecycle.rst index c761469e7..cde28e807 100644 --- a/doc/source/updates/kubernetes/update-status-and-lifecycle.rst +++ b/doc/source/updates/kubernetes/update-status-and-lifecycle.rst @@ -66,11 +66,11 @@ updated but not yet rebooted. Hostname IP Address Patch Current Reboot Required Release State ============ ============== ============= =============== ======= ===== - compute-0 192.168.204.95 Yes No 20.06 idle - compute-1 192.168.204.63 Yes No 20.06 idle - compute-2 192.168.204.99 Yes No 20.06 idle - compute-3 192.168.204.49 Yes No 20.06 idle - controller-0 192.168.204.3 Yes No 20.06 idle - controller-1 192.168.204.4 Yes No 20.06 idle - storage-0 192.168.204.37 Yes No 20.06 idle - storage-1 192.168.204.90 Yes No 20.06 idle + compute-0 192.168.204.95 Yes No nn.nn idle + compute-1 192.168.204.63 Yes No nn.nn idle + compute-2 192.168.204.99 Yes No nn.nn idle + compute-3 192.168.204.49 Yes No nn.nn idle + controller-0 192.168.204.3 Yes No nn.nn idle + controller-1 192.168.204.4 Yes No nn.nn idle + storage-0 192.168.204.37 Yes No nn.nn idle + storage-1 192.168.204.90 Yes No nn.nn idle diff --git a/doc/source/updates/kubernetes/upgrading-all-in-one-duplex-or-standard.rst b/doc/source/updates/kubernetes/upgrading-all-in-one-duplex-or-standard.rst index 0c4ccb5a0..c9b9dd900 100644 --- a/doc/source/updates/kubernetes/upgrading-all-in-one-duplex-or-standard.rst +++ b/doc/source/updates/kubernetes/upgrading-all-in-one-duplex-or-standard.rst @@ -94,7 +94,6 @@ of |prod| software. .. code-block:: none ~(keystone_admin)]$ system load-list - +----+----------+------------------+ | id | state | software_version | +----+----------+------------------+ @@ -102,7 +101,6 @@ of |prod| software. | 2 | imported | nn.nn | +----+----------+------------------+ - #. Apply any required software updates. The system must be 'patch current'. All software updates related to your diff --git a/doc/source/updates/kubernetes/upgrading-all-in-one-simplex.rst b/doc/source/updates/kubernetes/upgrading-all-in-one-simplex.rst index 1019d4e06..630647b16 100644 --- a/doc/source/updates/kubernetes/upgrading-all-in-one-simplex.rst +++ b/doc/source/updates/kubernetes/upgrading-all-in-one-simplex.rst @@ -97,7 +97,6 @@ the system contains more than 5 GBytes of these images, the upgrade start will f .. code-block:: none ~(keystone_admin)]$ system load-list - +----+----------+------------------+ | id | state | software_version | +----+----------+------------------+