Skip to content

Commit 6e0c0a0

Browse files
cschwedeklgill
andauthored
Review suggestions
Co-authored-by: Katie Gilligan <kgilliga@redhat.com>
1 parent 45137bb commit 6e0c0a0

3 files changed

Lines changed: 24 additions & 26 deletions

File tree

docs_user/assemblies/assembly_migrating-the-object-storage-service.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ ifdef::context[:parent-context: {context}]
88
= Migrating the {object_storage} to {rhos_long_noacro} nodes
99

1010
[role="_abstract"]
11-
If you are using the {rhos_prev_long} {object_storage_first_ref} as an Object Storage service, you must migrate your Object Storage service to {rhos_long_noacro} nodes.
11+
If you are using the {rhos_prev_long} {object_storage_first_ref} as an Object Storage service, you must migrate your Object Storage service to {rhos_long} nodes.
1212

1313
If you are using the Object Storage API of the Ceph Object Gateway (RGW), you can skip this chapter and migrate your Red Hat Ceph Storage cluster. For more information, see "Migrating the {Ceph} cluster". If you are not planning to migrate Ceph daemons from Controller nodes, you must perform the steps that are described in "Deploying a Ceph ingress daemon" and "Create or update the Object Storage service endpoints".
1414

1515
You have two options for handling the existing {object_storage} storage nodes:
1616

17-
* *Migrate data to new {rhos_acro} nodes* -- Provision new storage nodes on {rhocp_long} and gradually move data using `swift-ring-tool`.
18-
* *Convert existing nodes to data plane nodes* -- Keep the data on the same nodes and convert them to data plane nodes managed by the EDPM operator. No data movement is required.
17+
* *Migrate data to new {rhos_acro} nodes* : Provision new storage nodes on {rhocp_long} and gradually move data by using the `swift-ring-tool`.
18+
* *Convert existing nodes to data plane nodes*: Keep the data on the same nodes and convert them to data plane nodes that are managed by the data plane operator.
1919

2020
The data migration happens replica by replica. For example, if you have 3 replicas, move them one at a time to ensure that the other 2 replicas are still operational, which enables you to continue to use the {object_storage} during the migration.
2121

docs_user/modules/proc_adopting-the-object-storage-service.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,6 @@ Hello World!
136136

137137
After the initial adoption, the {object_storage} data is still stored on the existing {OpenStackShort} nodes. You have two options for handling these storage nodes:
138138

139-
* *Migrate data to new {rhos_acro} nodes* -- Provision new storage nodes on {rhocp_long} and gradually move data using `swift-ring-tool`. For more information, see xref:migrating-object-storage-data-to-rhoso-nodes_migrate-object-storage-service[Migrating the {object_storage_first_ref} data from {OpenStackShort} to {rhos_long} nodes].
139+
* *Migrate data to new {rhos_acro} nodes*: Provision new storage nodes on {rhocp_long} and gradually move data by using the `swift-ring-tool`. For more information, see xref:migrating-object-storage-data-to-rhoso-nodes_migrate-object-storage-service[Migrating the {object_storage_first_ref} data from {OpenStackShort} to {rhos_long} nodes].
140140

141-
* *Convert existing nodes to dataplane nodes* -- Keep the data on the same nodes and convert them to dataplane nodes managed by the openstack-operators. No data movement is required. For more information, see xref:converting-object-storage-nodes[Converting {object_storage} storage nodes].
141+
* *Convert existing nodes to dataplane nodes*: Keep the data on the same nodes and convert them to data plane nodes that are managed by the `openstack-operators`. For more information, see xref:converting-object-storage-nodes[Converting {object_storage} storage nodes].

docs_user/modules/proc_converting-object-storage-nodes.adoc

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,34 @@
77
If you used external {object_storage} storage nodes, you can convert these
88
nodes after the initial {object_storage_first_ref} adoption is complete. This
99
step reconfigures the nodes in-place while keeping the {object_storage}
10-
available throughout the process.
11-
12-
.Key concepts
13-
* *Pre-provisioned nodes*: Setting `preProvisioned: true` in the
14-
`OpenStackDataPlaneNodeSet` skips provisioning the node from scratch and does
15-
not reinstall the operating system.
16-
* *{object_storage} disk and mount preservation*: `edpm_swift_disks: []` must be
17-
set in *both* the `nodeTemplate` *and* in the individual node definition under
18-
`nodes` to ensure that no disks are formatted or mounted differently, leaving
19-
existing disk mounts untouched. The `SwiftRawDisks` parameter from
20-
{OpenStackPreviousInstaller} is not migrated or converted -- disks on
10+
available throughout the process.
11+
12+
Before you begin, review the following key concepts:
13+
Pre-provisioned nodes:: Setting `preProvisioned: true` in the
14+
`OpenStackDataPlaneNodeSet` custom resource (CR) skips provisioning the node from scratch and does not reinstall the operating system.
15+
{object_storage} disk and mount preservation:: `edpm_swift_disks: []` must be
16+
set in both the `nodeTemplate` and in the individual node definition under
17+
`nodes` to ensure that no disks are formatted or mounted differently.
18+
Existing disk mounts are untouched. The `SwiftRawDisks` parameter from
19+
{OpenStackPreviousInstaller} is not migrated or converted. Disks on
2120
converted nodes must be managed manually.
22-
* *Rolling conversion with multiple node sets*: In production, do not convert
21+
Rolling conversion with multiple node sets:: In production, do not convert
2322
all {object_storage} nodes at once. Instead, create separate
24-
`OpenStackDataPlaneNodeSet` resources and deploy them sequentially. Align
23+
`OpenStackDataPlaneNodeSet` custom resources and deploy them sequentially. Align
2524
groups with ring zones or regions so that no more than one replica of any
2625
partition is affected during the conversion.
2726

2827
.Prerequisites
2928

3029
* The initial {object_storage} adoption is complete. For more information, see
31-
xref:adopting-the-object-storage-service[Adopting the
30+
xref:adopting-the-object-storage-service_hsm-integration[Adopting the
3231
{object_storage}].
3332

3433
.Procedure
3534

36-
. Create a cleanup `OpenStackDataPlaneService` CR to remove remaining
37-
{OpenStackPreviousInstaller} artifacts (containers, systemd units,
38-
configuration) from the node:
35+
. Create a `OpenStackDataPlaneService` custom resource (CR) to remove remaining
36+
{OpenStackPreviousInstaller} artifacts, such as containers, `systemd` units, and
37+
configuration, from the node:
3938
+
4039
----
4140
$ oc apply -f - <<EOF
@@ -50,7 +49,7 @@ EOF
5049
----
5150

5251
ifeval::["{build}" == "upstream"]
53-
. Create a repo-setup `OpenStackDataPlaneService` CR to configure RPM repositories on the node:
52+
. Create a `OpenStackDataPlaneService` CR to configure RPM repositories on the node:
5453
+
5554
----
5655
$ oc apply -f - <<EOF
@@ -160,7 +159,6 @@ endif::[]
160159
- swift
161160
tlsEnabled: true
162161
----
163-
+
164162

165163
. Apply the `OpenStackDataPlaneNodeSet` CR:
166164
+
@@ -189,7 +187,7 @@ EOF
189187
$ oc wait --for condition=Ready openstackdataplanedeployment/openstack-edpm-ipam --timeout=30m
190188
----
191189

192-
. Monitor progress:
190+
.. Monitor the progress:
193191
+
194192
----
195193
$ watch oc get pod -l app=openstackansibleee
@@ -207,7 +205,7 @@ $ oc logs -l app=openstackansibleee -f --max-log-requests 20
207205
$ oc get openstackdataplanenodeset openstack-edpm-ipam
208206
----
209207

210-
* Verify that {object_storage} services are running on the converted node:
208+
* Verify that the Object Storage services are running on the converted node:
211209
+
212210
----
213211
$ ssh cloud-admin@192.168.122.100 "sudo systemctl status edpm_swift_*"

0 commit comments

Comments
 (0)