starlingx/docs
Code Issues Proposed changes

Resolve merge conflicts.

Browse Source 
This review is for merge conflicts between abandoned
https://review.opendev.org/c/starlingx/docs/+/797943
and
https://review.opendev.org/c/starlingx/docs/+/797948
and replaces those updates.

Signed-off-by: Ron Stone <ronald.stone@windriver.com>
Change-Id: Ibb386daeb633606a50b1444d95cdc95dea21959b
This commit is contained in:
Ron Stone
2021-06-28 15:52:32 -04:00
parent 5693da934c
commit 5e8ef28507
15 changed files with 342 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/_includes/distributed-upgrade-orchestration-process-using-the-cli.rest
View File

@@ -0,0 +1,6 @@
.. syscontroller-begin
.. syscontroller-end
.. dcupgrade-begin
.. dcupgrade-end

4
doc/source/_includes/performing-an-orchestrated-upgrade-using-the-cli.rest Normal file
View File

@@ -0,0 +1,4 @@
.. Orchupgradecli-begin
.. Orchupgradecli-end

3
doc/source/_includes/performing-an-orchestrated-upgrade.rest Normal file
View File

@@ -0,0 +1,3 @@
.. Orchupgrade-begin
.. Orchupgrade-end

4
doc/source/_includes/upgrading-all-in-one-duplex-or-standard.rest Normal file
View File

@@ -0,0 +1,4 @@
.. upgradeDX-begin
.. upgradeDX-end

4
doc/source/_includes/upgrading-all-in-one-simplex.rest Normal file
View File

@@ -0,0 +1,4 @@
.. upgradeAIO-begin
.. upgradeAIO-end

7
doc/source/_includes/upgrading-the-systemcontroller-using-the-cli.rest
View File

@@ -0,0 +1,7 @@
.. license-begin
.. license-end
.. upgradeDM-begin
.. upgradeDM-end

85
doc/source/dist_cloud/distributed-upgrade-orchestration-process-using-the-cli.rst
View File

@@ -43,7 +43,11 @@ following conditions:
- Redfish |BMC| is required for orchestrated subcloud upgrades. The install
values, and :command:`bmc\_password` for each |AIO-SX| subcloud controller
must be provided using the following |CLI| command on the System Controller:
must be provided using the following |CLI| command on the System Controller.
.. note::
This is only needed if the subcloud has not already been provisioned
with the Redfish BMC password.
.. code-block:: none
@@ -115,31 +119,33 @@ following conditions:
.. code-block:: none
~(keystone_admin)]$ dcmanager subcloud show subcloud1
+-----------------------------+----------------------------+
| Field | Value |
+-----------------------------+----------------------------+
| id | 1 |
| name | subcloud1 |
| description | None |
| location | None |
| software_version | nn.nn |
| management | managed |
| availability | online |
| deploy_status | complete |
| management_subnet | fd01:82::0/64 |
| management_start_ip | fd01:82::2 |
| management_end_ip | fd01:82::11 |
| management_gateway_ip | fd01:82::1 |
| systemcontroller_gateway_ip | fd01:81::1 |
| group_id | 1 |
| created_at | 2020-07-15 19:23:50.966984 |
| updated_at | 2020-07-17 12:36:28.815655 |
| dc-cert_sync_status | in-sync |
| identity_sync_status | in-sync |
| load_sync_status | in-sync |
| patching_sync_status | in-sync |
| platform_sync_status | in-sync |
+-----------------------------+----------------------------+
+-----------------------------+------------------------------+
| Field | Value |
+-----------------------------+------------------------------+
| id | 1 |
| name | subcloud1 |
| description | None |
| location | None |
| software_version | nn.nn |
| management | managed |
| availability | online |
| deploy_status | complete |
| management_subnet | fd01:82::0/64 |
| management_start_ip | fd01:82::2 |
| management_end_ip | fd01:82::11 |
| management_gateway_ip | fd01:82::1 |
| systemcontroller_gateway_ip | fd01:81::1 |
| group_id | 1 |
| created_at | 2021-06-07 21:05:16.224664 |
| updated_at | 2021-06-09 20:01:37.525012 |
| dc-cert_sync_status | in-sync |
| firmware_sync_status | in-sync |
| identity_sync_status | in-sync |
| kubernetes_sync_status | in-sync |
| load_sync_status | out-of-sync |
| patching_sync_status | in-sync |
| platform_sync_status | in-sync |
+-----------------------------+------------------------------+
#. To create an upgrade strategy, use the :command:`dcmanager upgrade-strategy create`
command.
@@ -223,9 +229,9 @@ following conditions:
+------------------------+----------------------------+
.. note::
A value of **None** for :command:`subcloud apply type`, and
:command:`max parallel subclouds` indicates that subcloud group values
are being used.
The values for `subcloud apply type` and `max parallel subclouds` will
be taken from the subcloud group if specified through the ``--group``
parameter.
#. Review the upgrade strategy for the subclouds.
@@ -277,10 +283,10 @@ following conditions:
+------------------+-------+-------------+-----------------------------+----------------------------+----------------------------+
| cloud | stage | state | details | started_at | finished_at |
+------------------+-------+-------------+-----------------------------+----------------------------+----------------------------+
| subcloud-1 | 2 | applying... | apply phase is 66% complete | 2020-03-13 14:12:12.262001 | 2020-03-13 14:15:52.450908 |
| subcloud-4 | 2 | applying... | apply phase is 83% complete | 2020-03-13 14:16:02.457588 | None |
| subcloud-5 | 2 | finishing | | 2020-03-13 14:16:02.463213 | None |
| subcloud-6 | 2 | applying... | apply phase is 66% complete | 2020-03-13 14:16:02.473669 | None |
| subcloud-1 | 2 | applying... | apply phase is 66% complete | 2021-06-11 14:12:12.262001 | 2021-06-11 14:15:52.450908 |
| subcloud-4 | 2 | applying... | apply phase is 83% complete | 2021-06-11 14:16:02.457588 | None |
| subcloud-5 | 2 | finishing | | 2021-06-11 14:16:02.463213 | None |
| subcloud-6 | 2 | applying... | apply phase is 66% complete | 2021-06-11 14:16:02.473669 | None |
+------------------+-------+-------------+-----------------------------+----------------------------+----------------------------+
#. To show the step currently being performed on a subcloud, use the
@@ -290,8 +296,9 @@ following conditions:
~(keystone_admin)]$ dcmanager strategy-step show <subcloud>
#. When the distributed upgrade orchestration complete, delete the upgrade
strategy, using the :command:`dcmanager upgrade-strategy delete` command.
#. When all the subclouds within the distributed upgrade orchestration indicate
they have entered the complete state, delete the upgrade strategy, using
the :command:`dcmanager upgrade-strategy delete` command.
.. code-block:: none
@@ -319,3 +326,11 @@ the secret payload is, "username: admin password:<password>", see,
.. only:: partner
.. include:: ../_includes/distributed-upgrade-orchestration-process-using-the-cli.rest
:start-after: syscontroller-begin
:end-before: syscontroller-end
.. only:: partner
.. include:: ../_includes/distributed-upgrade-orchestration-process-using-the-cli.rest
:start-after: dcupgrade-begin
:end-before: dcupgrade-end

22
doc/source/dist_cloud/installing-a-subcloud-using-redfish-platform-management-service.rst
View File

@@ -2,9 +2,9 @@
.. vbb1579292724479
.. _installing-a-subcloud-using-redfish-platform-management-service:
===============================================================
Installing a Subcloud Using Redfish Platform Management Service
===============================================================
============================================================
Install a Subcloud Using Redfish Platform Management Service
============================================================
For subclouds with servers that support Redfish Virtual Media Service \(version
1.2 or higher\), you can use the Central Cloud's CLI to install the ISO and
@@ -76,18 +76,18 @@ subcloud, the subcloud installation has these phases:
.. note::
Do not power off the servers. The host portion of the server can be
powered off, but the |BMC| portion of the server must be powered and
accessible from the System Controller.
Do not power off the servers. The host portion of the server can be
powered off, but the |BMC| portion of the server must be powered and
accessible from the System Controller.
There is no need to wipe the disks.
There is no need to wipe the disks.
.. note::
The servers require connectivity to a gateway router that provides IP
routing between the subcloud management subnet and the System Controller
management subnet, and between the subcloud |OAM| subnet and the
System Controller subnet.
The servers require connectivity to a gateway router that provides IP
routing between the subcloud management subnet and the System Controller
management subnet, and between the subcloud |OAM| subnet and the
System Controller subnet.
.. include:: ../_includes/installing-a-subcloud-using-redfish-platform-management-service.rest
:start-after: begin-ref-1

2
doc/source/dist_cloud/migrate-an-aiosx-subcloud-to-an-aiodx-subcloud.rst
View File

@@ -136,7 +136,7 @@ using the ansible playbook.
.. only:: partner
.. include:: /_includes/migrate-an-aiosx-subcloud-to-an-aiodx-subcloud.rest
.. include:: ../_includes/migrate-an-aiosx-subcloud-to-an-aiodx-subcloud.rest
.. _manually-migrate-a-subcloud-from-AIO-SX-to-AIO-DX:

14
doc/source/dist_cloud/upgrading-the-systemcontroller-using-the-cli.rst
View File

@@ -29,6 +29,8 @@ Follow the steps below to manually upgrade the System Controller:
.. only:: partner
.. include:: ../_includes/upgrading-the-systemcontroller-using-the-cli.rest
:start-after: license-begin
:end-before: license-end
#. Transfer iso and signature files to controller-0 \(active controller\) and import the load.
@@ -122,10 +124,9 @@ Follow the steps below to manually upgrade the System Controller:
- started:
- State entered after :command:`system upgrade-start` completes.
- Release 20.04 system data \(for example, postgres databases\) has
- Release nn.nn system data \(for example, postgres databases\) has
been exported to be used in the upgrade.
As part of the upgrade, the upgrade process checks the health of the system
@@ -266,7 +267,8 @@ Follow the steps below to manually upgrade the System Controller:
#. Upgrade **controller-0**.
.. xbooklink For more information, see :ref:`|updates-doc| <software-updates-and-upgrades-software-updates>` guide.
For more information, see :ref:`Updates and Upgrades
<software-updates-and-upgrades-software-updates>`.
#. Lock **controller-0**.
@@ -472,3 +474,9 @@ Follow the steps below to manually upgrade the System Controller:
Run the :command:`system upgrade-show` command, and the status will display
"no upgrade in progress". The subclouds will be out-of-sync.
.. only:: partner
.. include:: /_includes/upgrading-the-systemcontroller-using-the-cli.rest
:start-after: upgradeDM-begin
:end-before: upgradeDM-end

46
doc/source/storage/kubernetes/create-readwritemany-persistent-volume-claims.rst
View File

@@ -23,35 +23,35 @@ accessMode.
.. _iqu1616951298602-steps-bdr-qnm-tkb:
#. Create the **rwx-test-claim** Persistent Volume Claim.
Create the **rwx-test-claim** Persistent Volume Claim.
#. Create a yaml file defining the claim and its attributes.
#. Create a yaml file defining the claim and its attributes.
For example:
For example:
.. code-block:: none
.. code-block:: none
~(keystone_admin)]$
cat <<EOF > rwx-claim.yaml
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
name: rwx-test-claim
spec:
accessModes:
- ReadWriteMany
resources:
requests:
storage: 1Gi
storageClassName: cephfs
EOF
~(keystone_admin)]$
cat <<EOF > rwx-claim.yaml
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
name: rwx-test-claim
spec:
accessModes:
- ReadWriteMany
resources:
requests:
storage: 1Gi
storageClassName: cephfs
EOF
2. Apply the settings created above.
#. Apply the settings created above.
.. code-block:: none
.. code-block:: none
~(keystone_admin)]$ kubectl apply -f rwx-claim.yaml
persistentvolumeclaim/rwx-test-claim created
~(keystone_admin)]$ kubectl apply -f rwx-claim.yaml
persistentvolumeclaim/rwx-test-claim created
This results in 1GB |PVC| being created. You can view the |PVC| using the
@@ -64,8 +64,6 @@ following command.
NAME STATUS VOLUME CAPACITY ACCESS MODES STORAGECLASS
rwx-test-claim Bound pvc-df9f.. 1Gi RWX cephfs
.. code-block:: none
~(keystone_admin)]$ kubectl get persistentvolume
NAME CAPACITY ACCESS.. RECLAIM.. STATUS CLAIM STORAGECLASS
pvc-df9f.. 1Gi RWX Delete Bound default/rwx-test-claim cephfs

159
doc/source/updates/kubernetes/performing-an-orchestrated-upgrade-using-the-cli.rst
View File

@@ -61,9 +61,9 @@ upgrade orchestration to orchestrate the remaining nodes of the |prod|.
.. rubric:: |prereq|
See :ref:`Upgrading All-in-One Duplex / Standard
<upgrading-all-in-one-duplex-or-standard>` to manually upgrade the initial
controller node before doing the upgrade orchestration described below to
upgrade the remaining nodes of the |prod|.
<upgrading-all-in-one-duplex-or-standard>`, and perform Steps 1-8, to manually
upgrade the initial controller node before doing the upgrade orchestration
described below to upgrade the remaining nodes of the |prod|.
- The subclouds must use the Redfish platform management service if it is an All-in-one Simplex subcloud.
@@ -73,19 +73,28 @@ upgrade the remaining nodes of the |prod|.
.. _performing-an-orchestrated-upgrade-using-the-cli-steps-e45-kh5-sy:
#. Create a update strategy using the :command:`sw-manager` upgrade-strategy
#. Create a update strategy using the :command:`sw-manager upgrade-strategy create`
command.
.. code-block:: none
~(keystone_admin)]$ sw-manager upgrade-strategy create
strategy-uuid: 5435e049-7002-4403-acfb-7886f6da14af
controller-apply-type: serial
storage-apply-type: serial
worker-apply-type: serial
default-instance-action: migrate
alarm-restrictions: strict
current-phase: build
current-phase-completion: 0%
state: building
inprogress: true
Create an upgrade strategy, specifying the following parameters:
- storage-apply-type:
- serial \(default\): storage hosts will be upgraded one at a time
- parallel: storage hosts will be upgraded in parallel, ensuring that
@@ -167,16 +176,47 @@ upgrade the remaining nodes of the |prod|.
updated, but any additional pods on each worker host will be
relocated before it is upgraded.
#. Apply the upgrade-strategy. You can optionally apply a single stage at a time.
#. Run :command:`sw-manager upgrade-strategy show` command, to display the
current-phase-completion displaying the field goes from 0% to 100% in
various increments. Once at 100%, it returns:
.. code-block:: none
~(keystone_admin)]$ sw-manager upgrade-strategy show
strategy-uuid: 5435e049-7002-4403-acfb-7886f6da14af
controller-apply-type: serial
storage-apply-type: serial
worker-apply-type: serial
default-instance-action: migrate
alarm-restrictions: strict
current-phase: build
current-phase-completion: 100%
state: ready-to-apply
build-result: success
build-reason:
#. Apply the upgrade-strategy. You can optionally apply a single stage at a
time.
.. code-block:: none
~(keystone_admin)]$ sw-manager upgrade-strategy apply
strategy-uuid: 5435e049-7002-4403-acfb-7886f6da14af
controller-apply-type: serial
storage-apply-type: serial
worker-apply-type: serial
default-instance-action: migrate
alarm-restrictions: strict
current-phase: apply
current-phase-completion: 0%
state: applying
inprogress: true
While an upgrade-strategy is being applied, it can be aborted. This results
in:
- The current step will be allowed to complete.
- If necessary an abort phase will be created and applied, which will
@@ -187,3 +227,106 @@ upgrade the remaining nodes of the |prod|.
upgrade-strategy application fails, you must address the issue that caused
the failure, then delete/re-create the strategy before attempting to apply
it again.
#. Run :command:`sw-manager upgrade-strategy show` command, to display the
current-phase-completion displaying the field goes from 0% to 100% in
various increments. Once at 100%, it returns:
.. code-block:: none
~(keystone_admin)]$ sw-manager upgrade-strategy show
strategy-uuid: b91d8332-9ece-4578-b4dd-e9cf87b73f18
controller-apply-type: serial
storage-apply-type: serial
worker-apply-type: serial
default-instance-action: migrate
alarm-restrictions: strict
current-phase: apply
current-phase-completion: 100%
state: applied
apply-result: success
apply-reason:
#. Activate the upgrade.
During the running of the :command:`upgrade-activate` command, new
configurations are applied to the controller. 250.001 \(**hostname
Configuration is out-of-date**\) alarms are raised and are cleared as the
configuration is applied. The upgrade state goes from **activating** to
**activation-complete** once this is done.
.. code-block:: none
~(keystone_admin)]$ system upgrade-activate
+--------------+--------------------------------------+
| Property | Value |
+--------------+--------------------------------------+
| uuid | 61e5fcd7-a38d-40b0-ab83-8be55b87fee2 |
| state | activating |
| from_release | nn.nn |
| to_release | nn.nn |
+--------------+--------------------------------------+
The following states apply when this command is executed.
**activation-requested**
State entered when :command:`system upgrade-activate` is executed.
**activating**
State entered when we have started activating the upgrade by applying
new configurations to the controller and compute hosts.
**activation-complete**
State entered when new configurations have been applied to all
controller and compute hosts.
#. Check the status of the upgrade again to see it has reached
**activation-complete**
.. code-block:: none
~(keystone_admin)]$ system upgrade-show
+--------------+--------------------------------------+
| Property | Value |
+--------------+--------------------------------------+
| uuid | 61e5fcd7-a38d-40b0-ab83-8be55b87fee2 |
| state | activation-complete |
| from_release | nn.nn |
| to_release | nn.nn |
+--------------+--------------------------------------+
#. Complete the upgrade.
.. code-block:: none
~(keystone_admin)]$ system upgrade-complete
+--------------+--------------------------------------+
| Property | Value |
+--------------+--------------------------------------+
| uuid | 61e5fcd7-a38d-40b0-ab83-8be55b87fee2 |
| state | completing |
| from_release | nn.nn |
| to_release | nn.nn |
+--------------+--------------------------------------+
#. Delete the imported load.
.. code-block:: none
~(keystone_admin)]$ system load-list
+----+----------+------------------+
| id | state | software_version |
+----+----------+------------------+
| 1 | imported | nn.nn |
| 2 | active | nn.nn |
+----+----------+------------------+
~(keystone_admin)]$ system load-delete 1
Deleted load: load 1
.. only:: partner
.. include:: /_includes/performing-an-orchestrated-upgrade-using-the-cli.rest
:start-after: Orchupgradecli-begin
:end-before: Orchupgradecli-end

18
doc/source/updates/kubernetes/performing-an-orchestrated-upgrade.rst
View File

@@ -6,7 +6,9 @@
Perform an Orchestrated Upgrade
===============================
You can perform a partially-Orchestrated Upgrade of a |prod| system using the CLI and Horizon Web interface. Upgrade and stability of the initial controller node must be done manually before using upgrade orchestration to orchestrate the remaining nodes of the |prod|.
You can perform a partially-Orchestrated Upgrade of a |prod| system using the CLI and Horizon
Web interface. Upgrade and stability of the initial controller node must be done manually
before using upgrade orchestration to orchestrate the remaining nodes of the |prod|.
.. rubric:: |context|
@@ -35,9 +37,9 @@ You can perform a partially-Orchestrated Upgrade of a |prod| system using the CL
.. rubric:: |prereq|
See :ref:`Upgrading All-in-One Duplex / Standard
<upgrading-all-in-one-duplex-or-standard>`, to manually upgrade the initial
controller node before doing the upgrade orchestration described below to
upgrade the remaining nodes of the |prod| system.
<upgrading-all-in-one-duplex-or-standard>`, and perform Steps 1-8, to manually
upgrade the initial controller node before doing the upgrade orchestration
described below to upgrade the remaining nodes of the |prod| system.
.. rubric:: |proc|
@@ -167,3 +169,11 @@ upgrade the remaining nodes of the |prod| system.
upgrade-strategy application fails, you must address the issue that caused
the failure, then delete/re-create the strategy before attempting to apply
it again.
For more information, see: :ref:`Perform an Orchestrated Upgrade Using the CLI <performing-an-orchestrated-upgrade-using-the-cli>`
.. only:: partner
.. include:: /_includes/performing-an-orchestrated-upgrade.rest
:start-after: Orchupgrade-begin
:end-before: Orchupgrade-end

46
doc/source/updates/kubernetes/upgrading-all-in-one-duplex-or-standard.rst
View File

@@ -78,8 +78,8 @@ of |prod| software.
+--------------------+-----------+
| id | 2 |
| state | importing |
| software_version | 21.05 |
| compatible_version | 20.06 |
| software_version | nn.nn |
| compatible_version | nn.nn |
| required_patches | |
+--------------------+-----------+
@@ -97,8 +97,8 @@ of |prod| software.
+----+----------+------------------+
| id | state | software_version |
+----+----------+------------------+
| 1 | active | 20.06 |
| 2 | imported | 21.05 |
| 1 | active | nn.nn |
| 2 | imported | nn.nn |
+----+----------+------------------+
#. Apply any required software updates.
@@ -163,8 +163,8 @@ of |prod| software.
+--------------+--------------------------------------+
| uuid | 61e5fcd7-a38d-40b0-ab83-8be55b87fee2 |
| state | starting |
| from_release | 20.06 |
| to_release | 21.05 |
| from_release | nn.nn |
| to_release | nn.nn |
+--------------+--------------------------------------+
This will make a copy of the system data to be used in the upgrade.
@@ -177,7 +177,7 @@ of |prod| software.
- State entered after :command:`system upgrade-start` completes.
- Release 20.06 system data \(for example, postgres databases\) has
- Release nn.nn system data \(for example, postgres databases\) has
been exported to be used in the upgrade.
- Configuration changes must not be made after this point, until the
@@ -232,8 +232,8 @@ of |prod| software.
- State entered when controller-1 upgrade is complete.
- System data has been successfully migrated from release 20.06
to release 21.05.
- System data has been successfully migrated from release nn.nn
to release nn.nn.
- data-migration-failed:
@@ -252,8 +252,8 @@ of |prod| software.
+--------------+--------------------------------------+
| uuid | e7c8f6bc-518c-46d4-ab81-7a59f8f8e64b |
| state | data-migration-complete |
| from_release | 20.06 |
| to_release | 21.05 |
| from_release | nn.nn |
| to_release | nn.nn |
+--------------+--------------------------------------+
If the :command:`upgrade-show` status indicates
@@ -274,7 +274,7 @@ of |prod| software.
- upgrading-controllers:
- State entered when controller-1 has been unlocked and is
running release 21.05 software.
running release nn.nn software.
If it transitions to **unlocked-disabled-failed**, check the issue
before proceeding to the next step. The alarms may indicate a
@@ -318,7 +318,7 @@ of |prod| software.
- upgrading-hosts:
- State entered when both controllers are running release 21.05
- State entered when both controllers are running release nn.nn
software.
#. Check the system health to ensure that there are no unexpected alarms.
@@ -426,8 +426,8 @@ of |prod| software.
+--------------+--------------------------------------+
| uuid | 61e5fcd7-a38d-40b0-ab83-8be55b87fee2 |
| state | activating |
| from_release | 20.06 |
| to_release | 21.05 |
| from_release | nn.nn |
| to_release | nn.nn |
+--------------+--------------------------------------+
During the running of the :command:`upgrade-activate` command, new
@@ -464,8 +464,8 @@ of |prod| software.
+--------------+--------------------------------------+
| uuid | 61e5fcd7-a38d-40b0-ab83-8be55b87fee2 |
| state | activation-complete |
| from_release | 20.06 |
| to_release | 21.05 |
| from_release | nn.nn |
| to_release | nn.nn |
+--------------+--------------------------------------+
.. note::
@@ -481,8 +481,8 @@ of |prod| software.
+--------------+--------------------------------------+
| uuid | 61e5fcd7-a38d-40b0-ab83-8be55b87fee2 |
| state | completing |
| from_release | 20.06 |
| to_release | 21.05 |
| from_release | nn.nn |
| to_release | nn.nn |
+--------------+--------------------------------------+
#. Delete the imported load.
@@ -493,11 +493,15 @@ of |prod| software.
+----+----------+------------------+
| id | state | software_version |
+----+----------+------------------+
| 1 | imported | 20.06 |
| 2 | active | 21.05 |
| 1 | imported | nn.nn |
| 2 | active | nn.nn |
+----+----------+------------------+
~(keystone_admin)]$ system load-delete 1
Deleted load: load 1
.. only:: partner
.. include:: /_includes/upgrading-all-in-one-duplex-or-standard.rest
:start-after: upgradeDX-begin
:end-before: upgradeDX-end

50
doc/source/updates/kubernetes/upgrading-all-in-one-simplex.rst
View File

@@ -17,7 +17,7 @@ software.
- Perform a full backup to allow recovery.
.. note::
Back up files in the /home/sysadmin and /rootdirectories prior to doing
Back up files in the /home/sysadmin and /root directories prior to doing
an upgrade. Home directories are not preserved during backup or restore
operations, blade replacement, or upgrades.
@@ -52,7 +52,7 @@ the system contains more than 5 GBytes of these images, the upgrade start will f
~(keystone_admin)]$
#. Install the license file for the release you are upgrading to, for example,
20.06.
21.05.
.. code-block:: none
@@ -84,8 +84,8 @@ the system contains more than 5 GBytes of these images, the upgrade start will f
+--------------------+-----------+
| id | 2 |
| state | importing |
| software_version | 21.05 |
| compatible_version | 20.06 |
| software_version | nn.nn |
| compatible_version | nn.nn |
| required_patches | |
+--------------------+-----------+
@@ -100,8 +100,8 @@ the system contains more than 5 GBytes of these images, the upgrade start will f
+----+----------+------------------+
| id | state | software_version |
+----+----------+------------------+
| 1 | active | 20.06 |
| 2 | imported | 21.05 |
| 1 | active | nn.nn |
| 2 | imported | nn.nn |
+----+----------+------------------+
.. note::
@@ -165,8 +165,8 @@ the system contains more than 5 GBytes of these images, the upgrade start will f
+--------------+--------------------------------------+
| uuid | 61e5fcd7-a38d-40b0-ab83-8be55b87fee2 |
| state | starting |
| from_release | 20.06 |
| to_release | 21.05 |
| from_release | nn.nn |
| to_release | nn.nn |
+--------------+--------------------------------------+
This will back up the system data and images to /opt/platform-backup.
@@ -186,7 +186,7 @@ the system contains more than 5 GBytes of these images, the upgrade start will f
- State entered after :command:`system upgrade-start` completes.
- Release 20.04 system data \(for example, postgres databases\) has
- Release nn.nn system data \(for example, postgres databases\) has
been exported to be used in the upgrade.
- Configuration changes must not be made after this point, until the
@@ -214,8 +214,8 @@ the system contains more than 5 GBytes of these images, the upgrade start will f
+--------------+--------------------------------------+
| uuid | 61e5fcd7-a38d-40b0-ab83-8be55b87fee2 |
| state | started |
| from_release | 20.06 |
| to_release | 21.05 |
| from_release | nn.nn |
| to_release | nn.nn |
+--------------+--------------------------------------+
Ensure the upgrade state is **started**. It will take several minutes to
@@ -303,8 +303,8 @@ the system contains more than 5 GBytes of these images, the upgrade start will f
+--------------+--------------------------------------+
| uuid | 61e5fcd7-a38d-40b0-ab83-8be55b87fee2 |
| state | upgrading-hosts |
| from_release | 20.06 |
| to_release | 21.05 |
| from_release | nn.nn |
| to_release | nn.nn |
+--------------+--------------------------------------+
#. Unlock controller-0.
@@ -331,8 +331,8 @@ the system contains more than 5 GBytes of these images, the upgrade start will f
+--------------+--------------------------------------+
| uuid | 61e5fcd7-a38d-40b0-ab83-8be55b87fee2 |
| state | activating |
| from_release | 20.06 |
| to_release | 21.05 |
| from_release | nn.nn |
| to_release | nn.nn |
+--------------+--------------------------------------+
The following states apply when this command is executed.
@@ -357,6 +357,10 @@ the system contains more than 5 GBytes of these images, the upgrade start will f
.. code-block:: none
.. note::
This can take more than half an hour to complete.
~(keystone_admin)]$ system upgrade-show
+--------------+--------------------------------------+
| Property | Value |
@@ -367,8 +371,6 @@ the system contains more than 5 GBytes of these images, the upgrade start will f
| to_release | 21.05 |
+--------------+--------------------------------------+
.. note::
This can take more than half an hour to complete.
#. Complete the upgrade.
@@ -380,8 +382,8 @@ the system contains more than 5 GBytes of these images, the upgrade start will f
+--------------+--------------------------------------+
| uuid | 61e5fcd7-a38d-40b0-ab83-8be55b87fee2 |
| state | completing |
| from_release | 20.06 |
| to_release | 21.05 |
| from_release | nn.nn |
| to_release | nn.nn |
+--------------+--------------------------------------+
#. Delete the imported load.
@@ -392,9 +394,15 @@ the system contains more than 5 GBytes of these images, the upgrade start will f
+----+----------+------------------+
| id | state | software_version |
+----+----------+------------------+
| 1 | imported | 20.06 |
| 2 | active | 21.05 |
| 1 | imported | nn.nn |
| 2 | active | nn.nn |
+----+----------+------------------+
~(keystone_admin)]$ system load-delete 1
Deleted load: load 1
.. only:: partner
.. include:: /_includes/upgrading-all-in-one-simplex.rest
:start-after: upgradeAIO-begin
:end-before: upgradeAIO-end