Fix Swift node conversion documentation

Add port config step, move downstream vars to nodeTemplate,
improve verification

Signed-off-by: Christian Schwede <cschwede@redhat.com>

Author: cschwede

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

@@ -29,9 +29,54 @@ Rolling conversion with multiple node sets:: In production, do not convert
 * The initial {object_storage} adoption is complete. For more information, see
   xref:adopting-the-object-storage-service_hsm-integration[Adopting the
   {object_storage}].
+* Nodes cannot be members of more than one `OpenStackDataPlaneNodeSet` CR at
+  the same time. If the nodes you want to convert were part of the node set
+  created during the earlier adoption, delete that node set before proceeding:
++
+----
+$ oc delete openstackdataplanenodeset <adoption-nodeset-name>
+----
 
 .Procedure
 
+. Create a patch file to configure the {object_storage} data plane storage
+  ports. The {OpenStackPreviousInstaller} deployment used different default
+  ports (6002 for the account service, 6001 for the container service, 6000 for
+  the object service). The converted nodes must continue to use these same
+  ports to ensure connectivity between all {object_storage} storage nodes using
+  the unmodified rings:
++
+----
+cat > swift-config-patch.yaml << EOF
+spec:
+  swift:
+    template:
+      swiftStorage:
+        defaultConfigOverwrite:
+          01-account-server.conf: |
+            [DEFAULT]
+            bind_port = 6002
+          01-container-server.conf: |
+            [DEFAULT]
+            bind_port = 6001
+          01-object-server.conf: |
+            [DEFAULT]
+            bind_port = 6000
+EOF
+----
++
+NOTE: If any {object_storage} storage service settings were customized in the
+{OpenStackPreviousInstaller} deployment, include those settings as well. For
+example, if the workers count was changed or additional configuration options
+were added for the account, container, or object services, add them to the
+corresponding section in the patch file.
+
+. Apply the patch to the `OpenStackControlPlane` CR:
++
+----
+$ oc patch openstackcontrolplane openstack --type=merge --patch-file=swift-config-patch.yaml
+----
+
 . Create a `OpenStackDataPlaneService` custom resource (CR) to remove remaining
   {OpenStackPreviousInstaller} artifacts, such as containers, `systemd` units, and
   configuration, from the node:
@@ -94,6 +139,13 @@ spec:
   nodeTemplate:
     ansible:
       ansibleUser: cloud-admin
+ifeval::["{build}" == "downstream"]
+        ansibleVarsFrom:
+        - secretRef:
+            name: subscription-manager
+        - secretRef:
+            name: redhat-registry
+endif::[]
       ansibleVars:
         edpm_nodes_validation_validate_controllers_icmp: false
         edpm_nodes_validation_validate_gateway_icmp: false
@@ -106,30 +158,40 @@ spec:
         gather_facts: false
         timesync_ntp_servers:
         - hostname: pool.ntp.org
+ifeval::["{build}" != "downstream"]
+        edpm_bootstrap_command: |
+          # This is a hack to deploy RDO Delorean repos to RHEL as if it were Centos 9 Stream
+          set -euxo pipefail
+          curl -sL https://github.com/openstack-k8s-operators/repo-setup/archive/refs/heads/main.tar.gz | tar -xz
+          python3 -m venv ./venv
+          PBR_VERSION=0.0.0 ./venv/bin/pip install ./repo-setup-main
+          # This is required for FIPS enabled until trunk.rdoproject.org
+          # is not being served from a centos7 host, tracked by
+          # https://issues.redhat.com/browse/RHOSZUUL-1517
+          dnf -y install crypto-policies
+          update-crypto-policies --set FIPS:NO-ENFORCE-EMS
+          ./venv/bin/repo-setup current-podified -b antelope -d centos9 --stream
+          dnf -y upgrade openstack-selinux
+          rm -f /run/virtlogd.pid
+          rm -rf repo-setup-main
+endif::[]
+ifeval::["{build}" == "downstream"]
+        rhc_release: 9.2
+        rhc_repositories:
+            - {name: "*", state: disabled}
+            - {name: "rhel-9-for-x86_64-baseos-eus-rpms", state: enabled}
+            - {name: "rhel-9-for-x86_64-appstream-eus-rpms", state: enabled}
+            - {name: "rhel-9-for-x86_64-highavailability-eus-rpms", state: enabled}
+            - {name: "rhoso-18.0-for-rhel-9-x86_64-rpms", state: enabled}
+endif::[]
     ansibleSSHPrivateKeySecret: dataplane-adoption-secret
     managementNetwork: ctlplane
   nodes:
     edpm-swift-0:
       ansible:
         ansibleHost: 192.168.122.100
-ifeval::["{build}" == "downstream"]
-        ansibleVarsFrom:
-        - secretRef:
-            name: subscription-manager
-        - secretRef:
-            name: redhat-registry
-endif::[]
         ansibleVars:
           edpm_swift_disks: []
-ifeval::["{build}" == "downstream"]
-          rhc_release: 9.2
-          rhc_repositories:
-              - {name: "*", state: disabled}
-              - {name: "rhel-9-for-x86_64-baseos-eus-rpms", state: enabled}
-              - {name: "rhel-9-for-x86_64-appstream-eus-rpms", state: enabled}
-              - {name: "rhel-9-for-x86_64-highavailability-eus-rpms", state: enabled}
-              - {name: "rhoso-18.0-for-rhel-9-x86_64-rpms", state: enabled}
-endif::[]
       hostName: edpm-swift-0
       networks:
       - defaultRoute: true
@@ -144,9 +206,6 @@ endif::[]
         subnetName: subnet4
   preProvisioned: true
   services:
-ifeval::["{build}" == "upstream"]
-  - repo-setup
-endif::[]
   - bootstrap
   - download-cache
   - install-os
@@ -194,19 +253,20 @@ $ watch oc get pod -l app=openstackansibleee
 ----
 +
 ----
-$ oc logs -l app=openstackansibleee -f --max-log-requests 20
+$ oc logs -l app=openstackansibleee -f --max-log-requests 40
 ----
 
 .Verification
 
-* Verify that the node set is ready:
+* Verify that the Object Storage services are running on the converted node:
 +
 ----
-$ oc get openstackdataplanenodeset openstack-edpm-ipam
+$ ssh cloud-admin@192.168.122.100 "sudo systemctl status edpm_swift_*"
 ----
 
-* Verify that the Object Storage services are running on the converted node:
+* Verify that the Object Storage services are functional after conversion, for
+  example by uploading an object:
 +
 ----
-$ ssh cloud-admin@192.168.122.100 "sudo systemctl status edpm_swift_*"
+$ oc rsh openstackclient /bin/sh -c "touch obj && openstack container create cont && openstack object create cont obj"
 ----