Merge "Updated new implementation for Upgrades"

doc/source/dist_cloud/kubernetes/upgrading-the-systemcontroller-using-the-cli.rst

@@ -91,6 +91,31 @@ Follow the steps below to manually upgrade the System Controller:
             No instances running on controller-1: [OK]
             All kubernetes applications are in a valid state: [OK]
             Active controller is controller-0: [OK]
+            Disk space requirement: [OK]
+            Boot Device and Root file system Device: [Fail]
+            boot_device (/dev/sde) for controller-0 does not match root disk /dev/sda
+            rootfs_device (/dev/disk/by-path/pci-0000:00:1f.2-ata-1.0) for controller-0 does not match root disk /dev/sda
+
+    .. note::
+
+        In case "Disk space requirement: [Fail]"
+        Insufficient unallocated disk space on rootdisk for compute-0. Current
+        partitions have allocated disk space such that only 5GiB is available
+        but 23.5GiB unallocated disk space is needed. Insufficient total disk
+        space on rootdisk for controller-1, 220GiB needed, 180GiB available.
+
+        In case "Boot Device and Root file system Device: [Fail]";
+        boot_device (/dev/sdd) for controller-0 does not match any inventoried
+        disk rootfs_device for controller-1 is not assigned.
+
+    Use the following commands to correct the boot_device and/or rootfs_device
+    settings if you encounter an error:
+
+    .. code-block:: none
+
+        ~(keystone_admin)]$ system host-lock <hostname_or_id>
+        ~(keystone_admin)]$ system host-update <hostname_or_id> boot_device=<boot_device> rootfs_device=<rootfs_device>
+        ~(keystone_admin)]$ system host-unlock <hostname_or_id>
 
     By default, the upgrade process cannot run and is not recommended to run
     with active alarms present. It is strongly recommended that you clear your

doc/source/updates/kubernetes/manual-upgrade-overview.rst

@@ -23,7 +23,7 @@ This section describes the manual upgrade procedures.
    procedure, see |distcloud-doc|: :ref:`Orchestration Upgrade Overview
    <orchestration-upgrade-overview>`.
 
-Before starting the upgrade process, ensure that the following conditions are 
+Before starting the upgrade process, ensure that the following conditions are
 met:
 
 -   The system is patch current.
@@ -44,3 +44,4 @@ information, see:
 -   :ref:`Upgrading All-in-One Simplex <upgrading-all-in-one-simplex>`
 
 -   :ref:`Upgrading All-in-One Duplex / Standard <upgrading-all-in-one-duplex-or-standard>`
+

doc/source/updates/kubernetes/rolling-back-a-software-upgrade-after-the-second-controller-upgrade.rst

@@ -134,7 +134,7 @@ abort. It may be necessary to restore the system from a backup.
 
     .. code-block:: none
 
-        ~(keystone_admin)]$ system upgrade-complete
+        ~(keystone_admin)]$ system upgrade-abort-complete
 
     This cleans up the upgrade release, configuration, databases, and so forth.
 

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

@@ -28,10 +28,11 @@ of |prod| software.
     stick\); controller-0 must be active.
 
     .. note::
-        Make sure that the ``/home/sysadmin`` directory has enough space
+        Make sure that the filesystem containing the ``/home/sysadmin``
-        (at least 2GB of free space), otherwise the upgrade may fail. 
+        directory has enough space (at least 2GB of free space),
-        If more space is needed, it is recommended to delete the
+        otherwise the upgrade may fail. If more space is needed, it is
-        ``.iso bootimage`` previously imported after the :command:`load-import` command.
+        recommended to delete the ``.iso bootimage`` recently imported after
+        running the :command:`load-import` command.
 
 -   Transfer the new release software license file to controller-0, \(or onto a
     USB stick\).
@@ -68,15 +69,15 @@ of |prod| software.
     #.  Run the :command:`load-import` command on controller-0 to import
         the new release.
 
-        Source ``/etc/platform/openrc``. Also, you must specify an exact
+        Source ``/etc/platform/openrc``. Also, you can specify either the full
-        path to the ``*.iso`` bootimage file and to the ``*.sig`` bootimage
+        file path or relative paths to the ``*.iso`` bootimage file and to the
-        signature file.
+        ``*.sig`` bootimage signature file.
 
         .. code-block:: none
 
             $ source /etc/platform/openrc
-            ~(keystone_admin)]$ system load-import /home/sysadmin/<bootimage>.iso \
+            ~(keystone_admin)]$ system load-import [--local] /home/sysadmin/<bootimage>.iso <bootimage>.sig
-            <bootimage>.sig
+
             +--------------------+-----------+
             | Property           | Value     |
             +--------------------+-----------+
@@ -87,8 +88,17 @@ of |prod| software.
             | required_patches   |           |
             +--------------------+-----------+
 
-        The :command:`load-import` must be done on controller-0 and accepts
+        The :command:`load-import` must be done on controller-0.
-        relative paths.
+
+        (Optional) If ``--local`` is specified, the ISO and sig files are
+        transferred directly from the active controller filesystem to the
+        load directory, otherwise, they are transferred via the API.
+
+        .. note::
+
+            If ``--local`` is specified, the ISO and sig files are transferred
+            directly from the active controller filesystem to the load directory,
+            if it is not specified, the files are transferred via the API.
 
         .. note::
             This will take a few minutes to complete.
@@ -145,6 +155,29 @@ of |prod| software.
         No instances running on controller-1: [OK]
         All kubernetes applications are in a valid state: [OK]
         Active controller is controller-0: [OK]
+        Disk space requirement: [OK]
+        Boot Device and Root file system Device: [OK]
+
+    .. note::
+
+        In case of "Disk space requirement: [Fail]"
+        Insufficient unallocated disk space on rootdisk for compute-0. Current
+        partitions have allocated disk space such that only 5GiB is available
+        but 23.5GiB unallocated disk space is needed. Insufficient total disk
+        space on rootdisk for controller-1, 220GiB needed, 180GiB available.
+
+        In case "Boot Device and Root file system Device: [Fail]";
+        boot_device (/dev/sdd) for controller-0 does not match any inventoried disk
+        rootfs_device for controller-1 is not assigned.
+
+    Use the following commands to correct the boot_device and/or rootfs_device
+    settings if you encounter an error:
+
+    .. code-block:: none
+
+        ~(keystone_admin)]$ system host-lock <hostname_or_id>
+        ~(keystone_admin)]$ system host-update <hostname_or_id> boot_device=<boot_device> rootfs_device=<rootfs_device>
+        ~(keystone_admin)]$ system host-unlock <hostname_or_id>
 
     By default, the upgrade process cannot be run with active alarms present.
     Use the command :command:`system upgrade-start --force` to force the upgrade
@@ -442,7 +475,7 @@ of |prod| software.
 
     Wait until services have become available on the active controller-0 before
     proceeding to the next step. When all services on controller-0 are in the
-    ``enabled-active`` state, the swact is complete. 
+    ``enabled-active`` state, the swact is complete.
 
 #.  Activate the upgrade.
 

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

@@ -95,16 +95,15 @@ For more details, see :ref:`Detailed contents of a system backup
     #.  Run the :command:`load-import` command on controller-0 to import
         the new release.
 
-        First, source ``/etc/platform/openrc``.
+        Source ``/etc/platform/openrc``. Also, you can specify either the
-
+        full file path or relative paths to the ``*.iso`` bootimage file and to
-        You must specify an exact path to the ``*.iso`` bootimage file and to the
+        the ``*.sig`` bootimage signature file.
-        ``*.sig`` bootimage signature file.
 
         .. code-block:: none
 
             $ source /etc/platform/openrc
-            ~(keystone_admin)]$ system load-import /home/sysadmin/<bootimage>.iso \
+            ~(keystone_admin)]$ system load-import [--local] /home/sysadmin/<bootimage>.iso <bootimage>.sig
-            <bootimage>.sig
+
             +--------------------+-----------+
             | Property           | Value     |
             +--------------------+-----------+
@@ -115,8 +114,18 @@ For more details, see :ref:`Detailed contents of a system backup
             | required_patches   |           |
             +--------------------+-----------+
 
-        The :command:`load-import` must be done on controller-0 and accepts
+        The :command:`load-import` must be done on controller-0.
-        relative paths.
+
+        (Optional) If ``--local`` is specified, the ISO and sig files are
+        uploaded directly from the active controller, where `<local_iso_file_path>`
+        and `<local_sig_file_path>` are paths on the active controller to load
+        ISO files and sig files respectively.
+
+        .. note::
+
+            If ``--local`` is specified, the ISO and sig files are transferred
+            directly from the active controller filesystem to the load directory,
+            if it is not specified, the files are transferred via the API.
 
         .. note::
             This will take a few minutes to complete.
@@ -172,6 +181,29 @@ For more details, see :ref:`Detailed contents of a system backup
         No instances running on controller-1: [OK]
         All kubernetes applications are in a valid state: [OK]
         Active controller is controller-0: [OK]
+        Disk space requirement: [OK]
+        Boot Device and Root file system Device: [OK]
+
+    .. note::
+
+        In case of "Disk space requirement: [Fail]"
+        Insufficient unallocated disk space on rootdisk for compute-0. Current
+        partitions have allocated disk space such that only 5GiB is available
+        but 23.5GiB unallocated disk space is needed. Insufficient total disk
+        space on rootdisk for controller-1, 220GiB needed, 180GiB available.
+
+        In case "Boot Device and Root file system Device: [Fail]";
+        boot_device (/dev/sdd) for controller-0 does not match any inventoried disk
+        rootfs_device for controller-1 is not assigned.
+
+    Use the following commands to correct the boot_device and/or rootfs_device
+    settings if you encounter an error:
+
+    .. code-block:: none
+
+        ~(keystone_admin)]$ system host-lock <hostname_or_id>
+        ~(keystone_admin)]$ system host-update <hostname_or_id> boot_device=<boot_device> rootfs_device=<rootfs_device>
+        ~(keystone_admin)]$ system host-unlock <hostname_or_id>
 
     By default, the upgrade process cannot be run with Active Alarms present.
     However, management affecting alarms can be ignored with the