Skip to content

Commit d904b91

Browse files
Merge pull request #1038 from klgill/fix-vale-warnings
fixed warnings for DITA conversion
2 parents 36abc77 + a4fe93e commit d904b91

15 files changed

+62
-58
lines changed

docs_user/modules/con_adoption-limitations.adoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
[role="_abstract"]
77
Before you proceed with the adoption, check which features are Technology Previews or unsupported.
88

9-
.Technology Preview
10-
9+
Technology Preview::
10+
+
1111
The following features are Technology Previews and have not been tested within the context of the {rhos_long_noacro} adoption:
12-
12+
+
1313
* NFS Ganesha back end for {rhos_component_storage_file_first_ref}
1414
* iSCSI and FC-based drivers for {block_storage_first_ref}
1515
* {block_storage} back end for the {image_service_first_ref}
16-
16+
+
1717
The following {compute_service_first_ref} features are Technology Previews:
18-
18+
+
1919
* Compute hosts with `/var/lib/nova/instances` on NFS
2020
* NUMA-aware vswitches
2121
* PCI passthrough by flavor
@@ -28,10 +28,10 @@ The following {compute_service_first_ref} features are Technology Previews:
2828
* File-backed memory
2929
* Defining a custom inventory of resources in a YAML file, `provider.yaml`
3030

31-
.Unsupported features
32-
31+
Unsupported features::
32+
+
3333
The adoption process does not support the following features:
34-
34+
+
3535
* instanceHA
3636
* DCN
3737
* Designate

docs_user/modules/con_adoption-prerequisites.adoc

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Before you begin the adoption procedure, complete the following prerequisites:
88

99
Planning information::
10-
10+
+
1111
* Review the xref:adoption-limitations_{context}[Adoption limitations].
1212
* Review the {rhocp_long} requirements, data plane node requirements, Compute node requirements, and so on. For more information, see link:{planning}/index[{planning-t}].
1313
* Review the adoption-specific networking requirements. For more information, see xref:configuring-network-for-RHOSO-deployment_planning[Configuring the network for the RHOSO deployment].
@@ -24,6 +24,7 @@ endif::[]
2424
ifeval::["{build_variant}" == "ospdo"]
2525
* In director Operator adoption, the source {rhos_prev_long} {rhos_prev_ver} namespace is `openstack`. In order to successfully adopt the {OpenStackShort} {rhos_prev_ver} environment, the destination {rhos_acro} {rhos_curr_ver} namespace must be different, for example, `rhoso`.
2626
endif::[]
27+
+
2728
[source, shell]
2829
----
2930
ifeval::["{build_variant}" == "ospdo"]
@@ -36,32 +37,32 @@ endif::[]
3637
* Familiarize yourself with mapping RHOSO versions to OpenStack Operators and OpenStackVersion custom resources (CRs). For more information, see the Red Hat Knowledgebase article link:https://access.redhat.com/articles/7125383[How RHOSO versions map to OpenStack Operators and OpenStackVersion CRs].
3738

3839
Back-up information::
39-
40+
+
4041
* Back up your {rhos_prev_long} ({OpenStackShort}) {rhos_prev_ver} environment by using one of the following options:
4142
** The Relax-and-Recover tool. For more information, see link:https://docs.redhat.com/en/documentation/red_hat_openstack_platform/17.1/html/backing_up_and_restoring_the_undercloud_and_control_plane_nodes/assembly_backing-up-the-undercloud-and-the-control-plane-nodes-using-the-relax-and-recover-tool_br-undercloud-ctlplane[Backing up the undercloud and the control plane nodes by using the Relax-and-Recover tool] in _Backing up and restoring the undercloud and control plane nodes_.
4243
** The Snapshot and Revert tool. For more information, see link:https://docs.redhat.com/en/documentation/red_hat_openstack_platform/17.1/html/backing_up_and_restoring_the_undercloud_and_control_plane_nodes/assembly_snapshot-and-revert-appendix_snapshot-and-revert-appendix[Backing up your Red Hat OpenStack Platform cluster by using the Snapshot and Revert tool] in _Backing up and restoring the undercloud and control plane nodes_.
4344
** A third-party backup and recovery tool. For more information about certified backup and recovery tools, see the link:https://catalog.redhat.com/[Red Hat Ecosystem Catalog].
4445
* Back up the configuration files from the {OpenStackShort} services and {OpenStackPreviousInstaller} on your file system. For more information, see xref:pulling-configuration-from-tripleo-deployment_adopt-control-plane[Pulling the configuration from a {OpenStackPreviousInstaller} deployment].
4546

4647
Compute::
47-
48+
+
4849
* Upgrade your Compute nodes to Red Hat Enterprise Linux {rhel_prev_ver}. For more information, see link:https://docs.redhat.com/en/documentation/red_hat_openstack_platform/17.1/html-single/framework_for_upgrades_16.2_to_17.1/index#upgrading-compute-nodes_upgrading-the-compute-node-operating-system[Upgrading all Compute nodes to RHEL 9.2] in _Framework for upgrades (16.2 to 17.1)_.
4950
* Perform a minor update to the latest {OpenStackShort} version. For more information, see link:https://docs.redhat.com/en/documentation/red_hat_openstack_platform/17.1/html/performing_a_minor_update_of_red_hat_openstack_platform/index[Performing a minor update of Red Hat OpenStack Platform].
5051
* Install the `systemd-container` package on your Compute hosts. For more information, see xref:installing-the-systemd-container-package-on-compute-hosts_{context}[Installing the `systemd-container` package on Compute hosts].
5152

5253
ML2/OVS::
53-
54+
+
5455
* If you use the Modular Layer 2 plug-in with Open vSwitch mechanism driver (ML2/OVS), migrate it to the Modular Layer 2 plug-in with Open Virtual Networking (ML2/OVN) mechanism driver. For more information, see link:https://docs.redhat.com/en/documentation/red_hat_openstack_platform/17.1/html/migrating_to_the_ovn_mechanism_driver/index[Migrating to the OVN mechanism driver].
5556

5657
Tools::
57-
58+
+
5859
* Install the `oc` command line tool on your workstation.
5960
* Install the `podman` command line tool on your workstation.
6061

6162
{OpenStackShort} {rhos_prev_ver} release::
62-
63+
+
6364
* The {OpenStackShort} {rhos_prev_ver} cloud is updated to the latest minor version of the {rhos_prev_ver} release.
6465

6566
{OpenStackShort} {rhos_prev_ver} hosts::
66-
67+
+
6768
* All control plane and data plane hosts of the {OpenStackShort} {rhos_prev_ver} cloud are up and running, and continue to run throughout the adoption procedure.

docs_user/modules/con_adoption-process-overview.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
[role="_abstract"]
77
Familiarize yourself with the steps of the adoption process and the optional post-adoption tasks.
88

9-
.Main adoption process
10-
9+
Main adoption process::
10+
+
1111
. xref:migrating-tls-everywhere_configuring-network[Migrate TLS everywhere (TLS-e) to the Red Hat OpenStack Services on OpenShift (RHOSO) deployment].
1212
. xref:migrating-databases-to-the-control-plane_configuring-network[Migrate your existing databases to the new control plane].
1313
. xref:adopting-openstack-control-plane-services_configuring-network[Adopt your Red Hat OpenStack Platform 17.1 control plane services to the new RHOSO 18.0 deployment].
@@ -22,8 +22,8 @@ endif::[]
2222
.. xref:migrating-ceph-rgw_migrating-ceph-monitoring[Migrate {Ceph} RGW to external RHEL nodes].
2323
.. xref:migrating-ceph-rbd_migrating-ceph-monitoring[Migrate {Ceph} RBD to external RHEL nodes].
2424

25-
.Post-adoption tasks
26-
25+
Post-adoption tasks::
26+
+
2727
* Optional: Run tempest to verify that the entire adoption process is working properly. For more information, see link:{defaultURL}/validating_and_troubleshooting_the_deployed_cloud/index[Validating and troubleshooting the deployed cloud].
2828
* Optional: Perform a minor update from RHEL 9.2 to 9.4. You can perform a minor update any time after you complete the adoption procedure. For more information, see link:{defaultURL}/updating_your_environment_to_the_latest_maintenance_release/index[Updating your environment to the latest maintenance release].
2929
* Optional: Verify that you migrated all services from the Controller nodes, and then power off the nodes. If any services are still running in the Controller nodes, such as Open Virtual Networking (ML2/OVN), {object_storage_first_ref}, or {Ceph}, do not power off the nodes.

docs_user/modules/proc_adopting-the-networking-service.adoc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ The {networking_service} adoption is complete if you see the following results:
1212
* The `NeutronAPI` service is running.
1313
* The {identity_service_first_ref} endpoints are updated, and the same back end of the source cloud is available.
1414

15+
ifeval::["{build}" != "downstream"]
16+
The {networking_service} adoption follows a similar pattern to https://github.com/openstack-k8s-operators/data-plane-adoption/blob/main/keystone_adoption.md[Keystone].
17+
endif::[]
18+
1519
.Prerequisites
1620

1721
* Ensure that Single Node OpenShift or OpenShift Local is running in the {rhocp_long} cluster.
@@ -20,9 +24,6 @@ The {networking_service} adoption is complete if you see the following results:
2024

2125

2226
.Procedure
23-
ifeval::["{build}" != "downstream"]
24-
The {networking_service} adoption follows a similar pattern to https://github.com/openstack-k8s-operators/data-plane-adoption/blob/main/keystone_adoption.md[Keystone].
25-
endif::[]
2627

2728
* Patch the `OpenStackControlPlane` CR to deploy the {networking_service}:
2829
+

docs_user/modules/proc_adopting-the-orchestration-service.adoc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ is disabled. The patch starts the service with the configuration parameters that
99

1010
After you complete the adoption process, you have CRs for `Heat`, `HeatAPI`, `HeatEngine`, and `HeatCFNAPI`, and endpoints within the {identity_service_first_ref} to facilitate these services.
1111

12+
ifeval::["{build}" != "downstream"]
13+
The Heat Adoption follows a similar workflow to https://github.com/openstack-k8s-operators/data-plane-adoption/blob/main/keystone_adoption.md[Keystone].
14+
endif::[]
15+
1216
.Prerequisites
1317

1418
* The source {OpenStackPreviousInstaller} environment is running.
@@ -17,9 +21,6 @@ After you complete the adoption process, you have CRs for `Heat`, `HeatAPI`, `He
1721
* If your existing {orchestration} stacks contain resources from other services such as {networking_first_ref}, {compute_service_first_ref}, {object_storage_first_ref}, and so on, adopt those sevices before adopting the {orchestration}.
1822

1923
.Procedure
20-
ifeval::["{build}" != "downstream"]
21-
The Heat Adoption follows a similar workflow to https://github.com/openstack-k8s-operators/data-plane-adoption/blob/main/keystone_adoption.md[Keystone].
22-
endif::[]
2324

2425
. Retrieve the existing `auth_encryption_key` and `service` passwords. You use these passwords to patch the `osp-secret`. In the following example, the `auth_encryption_key` is used as `HeatAuthEncryptionKey` and the `service` password is used as `HeatPassword`:
2526
+

docs_user/modules/proc_configuring-openshift-worker-nodes.adoc

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,21 @@ To connect service pods to isolated networks on {rhocp_long} worker nodes that r
88

99
This configuration is managed by the NMState operator, which uses `NodeNetworkConfigurationPolicy` custom resources (CRs) to define the desired network configuration for the nodes.
1010

11+
// TODO: Move this to the IPv6 section once it is fully documented, both upstream and downstream.
12+
ifeval::["{build}" != "downstream"]
13+
[WARNING]
14+
In IPv6, {rhocp_long} worker nodes need a `/64` prefix allocation due to OVN
15+
limitations (RFC 4291). For dynamic IPv6 configuration, you need to change the
16+
prefix allocation on the Router Advertisement settings. If you want to use
17+
manual configuration for IPv6, define a similar CR to the
18+
`NodeNetworkConfigurationPolicy` CR example in this procedure, and define an
19+
IPv6 address and disable IPv4. Because the constraint for the `/64` prefix did
20+
not exist in {OpenstackPreviousInstaller}, your {OpenStackShort}
21+
control plane network might not have enough capacity to allocate these
22+
networks. If that is the case, allocate a prefix that fits a large enough number
23+
of addresses, for example, `/60`. The prefix depends on the number of worker nodes you have.
24+
endif::[]
25+
1126
.Procedure
1227

1328
* For each {OpenShiftShort} worker node, define a `NodeNetworkConfigurationPolicy` CR that describes the desired network configuration. For example:
@@ -72,18 +87,3 @@ items:
7287
kubernetes.io/hostname: ocp-worker-0
7388
node-role.kubernetes.io/worker: ""
7489
----
75-
76-
// TODO: Move this to the IPv6 section once it is fully documented, both upstream and downstream.
77-
ifeval::["{build}" != "downstream"]
78-
[WARNING]
79-
In IPv6, {rhocp_long} worker nodes need a `/64` prefix allocation due to OVN
80-
limitations (RFC 4291). For dynamic IPv6 configuration, you need to change the
81-
prefix allocation on the Router Advertisement settings. If you want to use
82-
manual configuration for IPv6, define a similar CR to the
83-
`NodeNetworkConfigurationPolicy` CR example in this procedure, and define an
84-
IPv6 address and disable IPv4. Because the constraint for the `/64` prefix did
85-
not exist in {OpenstackPreviousInstaller}, your {OpenStackShort}
86-
control plane network might not have enough capacity to allocate these
87-
networks. If that is the case, allocate a prefix that fits a large enough number
88-
of addresses, for example, `/60`. The prefix depends on the number of worker nodes you have.
89-
endif::[]

docs_user/modules/proc_deploying-backend-services.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ spec:
351351
customIssuer: rootca-internal
352352
enabled: true
353353
----
354-
354+
+
355355
[NOTE]
356356
====
357357
If you use IPv6, change the load balancer IPs to the IPs in your environment, for example:

docs_user/modules/proc_migrating-ceph-mds.adoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,8 @@ mds.mds.cephstorage-2.gnfhfe cephstorage-2.redhat.local run
250250
----
251251

252252
ifeval::["{build}" != "downstream"]
253-
.Useful resources
254-
253+
[role="_additional-resources"]
254+
.Additional resources
255255
* https://docs.ceph.com/en/reef/cephfs/eviction[cephfs - eviction]
256-
257256
* https://docs.ceph.com/en/reef/cephfs/standby/#configuring-mds-file-system-affinity[ceph mds - affinity]
258257
endif::[]

docs_user/modules/proc_migrating-object-storage-data-to-rhoso-nodes.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ swift-ring-tool remove 172.20.0.100
144144
swift-ring-tool rebalance
145145
swift-ring-tool push'
146146
----
147-
147+
+
148148
[NOTE]
149149
Even if all replicas are on the new nodes and the `swift-dispersion-report` command reports 100% of the copies found, there might still be data on the old nodes. The replicators remove this data, but it might take more time.
150150

docs_user/modules/proc_performing-a-fast-forward-upgrade-on-compute-services.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,5 +184,5 @@ ${BASH_ALIASES[openstack]} server list -c Name -c Status -f value | grep -qF "te
184184
${BASH_ALIASES[openstack]} server --os-compute-api-version 2.48 show --diagnostics test --fit-width -f json | jq -r '.state' | grep running || echo FAIL
185185
----
186186

187-
[NOTE]
187+
.Next steps
188188
After the data plane adoption, the Compute hosts continue to run Red Hat Enterprise Linux (RHEL) {rhel_prev_ver}. To take advantage of RHEL {rhel_curr_ver}, perform a minor update procedure after finishing the adoption procedure.

0 commit comments

Comments
 (0)