Merge "SX to DX Migration Procedure for rook-ceph requires additional steps"

doc/source/_includes/migrate-an-aiosx-subcloud-to-an-aiodx-subcloud.rest

@@ -0,0 +1,5 @@
+.. step-begin
+.. step-end
+
+.. note-begin
+.. note-end

doc/source/dist_cloud/kubernetes/migrate-an-aiosx-subcloud-to-an-aiodx-subcloud.rst

@@ -90,7 +90,10 @@ using the ansible playbook.
 
 .. rubric:: |proc|
 
-#.  Use the :command:`ansible-vault create migrate-subcloud1-overrides-EXAMPLE.yml` command to securely specify the |OAM| unit IP addresses and the ansible ssh password. The existing |OAM| IP address of the |AIO-SX| system will be used as the |OAM| floating IP address of the new |AIO-DX| system. 
+#.  Use the :command:`ansible-vault create migrate-subcloud1-overrides-EXAMPLE.yml`
+    command to securely specify the |OAM| unit IP addresses and the ansible ssh
+    password. The existing |OAM| IP address of the |AIO-SX| system will be used
+    as the |OAM| floating IP address of the new |AIO-DX| system.
 
     In the following example, 10.10.10.13 and 10.10.10.14 are the new |OAM|
     unit IP addresses for controller-0 and controller-1 respectively and
@@ -149,8 +152,8 @@ using the ansible playbook.
 
     .. note::
 
-        Run the following command on an |AIO-SX| system before changing to |AIO-DX|, as this
+        Run the following command on an |AIO-SX| system before changing to
-        does not apply to |AIO-DX| systems.
+        |AIO-DX|, as this does not apply to |AIO-DX| systems.
 
     .. code-block:: none
 
@@ -192,6 +195,8 @@ using the ansible playbook.
 .. only:: partner
 
     .. include:: /_includes/migrate-an-aiosx-subcloud-to-an-aiodx-subcloud.rest
+        :start-after: step-begin
+        :end-before: step-end
 
 
 .. _manually-migrate-a-subcloud-from-AIO-SX-to-AIO-DX:
@@ -212,7 +217,9 @@ commands on the |AIO-SX| subcloud.
 
         ~(keystone_admin)$ system host-lock controller-0
 
-    Run the following command on an |AIO-SX| system before changing to |AIO-DX|:
+
+#.  Run the following command on an |AIO-SX| system before changing to |AIO-DX|
+    to increase the replication factor.
 
     For Ceph installation:
 
@@ -230,7 +237,7 @@ commands on the |AIO-SX| subcloud.
 
     .. code-block:: none
 
-        ~(keystone_admin)$ system modify --system_mode=duplex
+        ~(keystone_admin)$ system modify -m duplex
 
 #.  Add the node IP addresses (controller-0 and controller-1) to the address
     pool for the required networks.
@@ -341,6 +348,19 @@ commands on the |AIO-SX| subcloud.
         | ea9a6a9a-f96b-4d52-a22c-1922b2bb77a2 | storage-pool-ipv4           | 10.10.20.0    | 24     | random | ['10.10.20.1-10.10.20.100']           | 10.10.20.1       | 10.10.20.2          | 10.10.20.3          | None            |
         | 47553723-b090-4324-bd6e-d4cc7e212da4 | storage-pool-ipv6           | fdfe::        | 64     | random | ['fdfe::1-fdfe::100']                 | fdfe::1          | fdfe::2             | fdfe::3             | None            |
 
+#. Unlock the controller.
+
+    .. code-block:: none
+
+        ~(keystone_admin)$ system host-unlock controller-0
+
+#.  Wait until controller-0 boots up and configure and enable IPsec on
+    controller-0.
+
+    .. code-block:: none
+
+        ~(keystone_admin)$ sudo ipsec-client pxecontroller
+
 **************************************
 Additional Steps for Ceph Installation
 **************************************
@@ -369,10 +389,20 @@ follow the additional steps below:
 
        ~(keystone_admin)$ system host-stor-list controller-1
 
+.. note::
+
+    For more details about Ceph OSDs see
+    :ref:`add-ssd-backed-journals-using-the-cli`.
+
 ***********************************************************
 Additional Steps for Rook Container-based Ceph Installation
 ***********************************************************
 
+.. note::
+
+    For more information on how to configure the Rook Ceph cluster please refer
+    to :ref:`deployment-models-for-rook-ceph-b855bd0108cf`.
+
 When you migrate an |AIO-SX| subcloud to an |AIO-DX| subcloud with Rook
 container-based Ceph installations, follow the additional steps below:
 
@@ -405,6 +435,11 @@ After configuring controller-1:
 
           ~(keystone_admin)$ system host-stor-list controller-1
 
+      .. note::
+
+        Additional details about Rook Ceph |OSDs| are available at
+        :ref:`rook-ceph-osd-management-674d728af874`.
+
 After unlocking controller-1:
 
 #. Wait until Ceph has two active monitors. To verify, run :command:`ceph -s`
@@ -441,3 +476,8 @@ After unlocking controller-1:
 
        ~(keystone_admin)$ system application-apply rook-ceph
 
+.. only:: partner
+
+.. include:: /_includes/migrate-an-aiosx-subcloud-to-an-aiodx-subcloud.rest
+    :start-after: note-begin
+    :end-before: note-end

doc/source/storage/kubernetes/install-rook-ceph-a7926a1f9b70.rst

@@ -16,6 +16,11 @@ more details, see
 https://rook.io/docs/rook/latest-release/Getting-Started/intro/. for more
 details.
 
+.. note::
+
+    For any new |prod-long| deployments Rook Ceph is mandatory in order to
+    prevent any service disruptions during migration procedures.
+
 .. rubric:: |prereq|
 
 Before configuring the deployment model and services: