Skip to content

Commit 2ac9332

Browse files
committed
moved links to additional resources heading
1 parent 1dc5e8d commit 2ac9332

11 files changed

Lines changed: 80 additions & 34 deletions

docs_user/assemblies/assembly_adopting-the-image-service.adoc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ To complete the {image_service} adoption, ensure that your environment meets the
2121
* You have a Single Node OpenShift or OpenShift Local that is running in the {rhocp_long} cluster.
2222
* Optional: You can reach an internal/external `Ceph` cluster by both `crc` and {OpenStackPreviousInstaller}.
2323

24-
If you have image quotas in {OpenStackShort} {rhos_prev_ver}, these quotas are transferred to {rhos_long} {rhos_curr_ver} because the image quota system in {rhos_curr_ver} is disabled by default. For more information about enabling image quotas in {rhos_curr_ver}, see link:{defaultURL}/customizing_persistent_storage/assembly_glance-customizing-the-image-service_customizing-cinder#assembly_glance-configuring-quotas_configuring-glance[Configuring image quotas] in _Customizing persistent storage_. If you enable image quotas in {rhos_acro} {rhos_curr_ver}, the new quotas replace the legacy quotas from {OpenStackShort} {rhos_prev_ver}.
24+
If you have image quotas in {OpenStackShort} {rhos_prev_ver}, these quotas are transferred to {rhos_long} {rhos_curr_ver} because the image quota system in {rhos_curr_ver} is disabled by default. If you enable image quotas in {rhos_acro} {rhos_curr_ver}, the new quotas replace the legacy quotas from {OpenStackShort} {rhos_prev_ver}.
2525

2626
include::../modules/proc_adopting-image-service-with-object-storage-backend.adoc[leveloffset=+1]
2727

@@ -35,5 +35,9 @@ include::../modules/proc_adopting-image-service-with-dcn-backend.adoc[leveloffse
3535

3636
include::../modules/proc_verifying-the-image-service-adoption.adoc[leveloffset=+1]
3737

38+
[role="_additional-resources"]
39+
== Additional resources
40+
* link:{defaultURL}/customizing_persistent_storage/assembly_glance-customizing-the-image-service_customizing-cinder#assembly_glance-configuring-quotas_configuring-glance[Configuring image quotas]
41+
3842
ifdef::parent-context[:context: {parent-context}]
3943
ifndef::parent-context[:!context:]

docs_user/assemblies/assembly_configuring-isolated-networks.adoc

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ ifdef::context[:parent-context: {context}]
1010
[role="_abstract"]
1111
Before you begin replicating your existing VLAN and IPAM configuration in the {rhos_long} environment, you must have the following IP address allocations for the new control plane services:
1212

13-
* 1 IP address for each isolated network on each {rhocp_long} worker node. You configure these IP addresses in the `NodeNetworkConfigurationPolicy` custom resources (CRs) for the {OpenShiftShort} worker nodes. For more information, see xref:configuring-openshift-worker-nodes_isolated-networks[Configuring {OpenShiftShort} worker nodes].
14-
* 1 IP range for each isolated network for the data plane nodes. You configure these ranges in the `NetConfig` CRs for the data plane nodes. For more information, see xref:configuring-data-plane-nodes_isolated-networks[Configuring data plane nodes].
13+
* 1 IP address for each isolated network on each {rhocp_long} worker node. You configure these IP addresses in the `NodeNetworkConfigurationPolicy` custom resources (CRs) for the {OpenShiftShort} worker nodes.
14+
* 1 IP range for each isolated network for the data plane nodes. You configure these ranges in the `NetConfig` CRs for the data plane nodes.
1515
* 1 IP range for each isolated network for control plane services. These ranges
16-
enable pod connectivity for isolated networks in the `NetworkAttachmentDefinition` CRs. For more information, see xref:configuring-networking-for-control-plane-services_isolated-networks[Configuring the networking for control plane services].
17-
* 1 IP range for each isolated network for load balancer IP addresses. These IP ranges define load balancer IP addresses for MetalLB in the `IPAddressPool` CRs. For more information, see xref:configuring-networking-for-control-plane-services_isolated-networks[Configuring the networking for control plane services].
16+
enable pod connectivity for isolated networks in the `NetworkAttachmentDefinition` CRs.
17+
* 1 IP range for each isolated network for load balancer IP addresses. These IP ranges define load balancer IP addresses for MetalLB in the `IPAddressPool` CRs.
1818

1919
[NOTE]
2020
The exact list and configuration of isolated networks in the following procedures should reflect the actual {rhos_prev_long} environment. The number of isolated networks might differ from the examples used in the procedures. The IPAM scheme might also differ. Only the parts of the configuration that are relevant to configuring networks are shown. The values that are used in the following procedures are examples. Use values that are specific to your configuration.
@@ -25,5 +25,11 @@ include::../modules/proc_configuring-networking-for-control-plane-services.adoc[
2525

2626
include::../modules/proc_configuring-data-plane-nodes.adoc[leveloffset=+1]
2727

28+
[role="_additional-resources"]
29+
== Additional resources
30+
* xref:configuring-openshift-worker-nodes_isolated-networks[Configuring {OpenShiftShort} worker nodes]
31+
* xref:configuring-data-plane-nodes_isolated-networks[Configuring data plane nodes]
32+
* xref:configuring-networking-for-control-plane-services_isolated-networks[Configuring the networking for control plane services]
33+
2834
ifdef::parent-context[:context: {parent-context}]
2935
ifndef::parent-context[:!context:]

docs_user/assemblies/assembly_configuring-network-for-RHOSO-deployment.adoc

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,23 @@ Perform the following tasks to incorporate the existing network configuration:
2020

2121
When configuring nodes and services, the general approach is as follows:
2222

23-
* For IPAM, you can either reuse subnet ranges from the existing deployment or, if there is a shortage of free IP addresses in existing subnets, define new ranges for the new control plane services. If you define new ranges, you configure IP routing between the old and new ranges. For more information, see xref:planning-your-ipam-configuration_configuring-network[Planning your IPAM configuration].
24-
ifeval::["{build_variant}" == "ospdo"]
25-
For more information about creating networks for a director Operator environment, see link:https://docs.redhat.com/en/documentation/red_hat_openstack_platform/17.1/html-single/deploying_an_overcloud_in_a_red_hat_openshift_container_platform_cluster_with_director_operator/index#proc_creating-an-overcloud-network-with-the-openstacknetconfig-CRD_OSPdO-networks[Creating networks with director Operator] in _Deploying an overcloud in a Red Hat OpenShift Container Platform cluster with director Operator_.
26-
endif::[]
23+
* For IPAM, you can either reuse subnet ranges from the existing deployment or, if there is a shortage of free IP addresses in existing subnets, define new ranges for the new control plane services. If you define new ranges, you configure IP routing between the old and new ranges.
2724
* For VLAN tags, always reuse the configuration from the existing deployment.
2825

29-
[NOTE]
30-
For more information about the network architecture and configuration, see
31-
link:{deploying-rhoso}/assembly_preparing-rhoso-networks[Preparing networks for Red Hat OpenStack Services on OpenShift] in _{deploying-rhoso-t}_ and link:{defaultOCPURL}/networking/about-networking[About networking] in _Networking_.
32-
33-
3426
include::../modules/proc_retrieving-network-information-from-your-existing-deployment.adoc[leveloffset=+1]
3527

3628
include::../assemblies/assembly_planning-your-ipam-configuration.adoc[leveloffset=+1]
3729

3830
include::../assemblies/assembly_configuring-isolated-networks.adoc[leveloffset=+1]
3931

32+
[role="_additional-resources"]
33+
== Additional resources
34+
* xref:planning-your-ipam-configuration_configuring-network[Planning your IPAM configuration]
35+
ifeval::["{build_variant}" == "ospdo"]
36+
* link:https://docs.redhat.com/en/documentation/red_hat_openstack_platform/17.1/html-single/deploying_an_overcloud_in_a_red_hat_openshift_container_platform_cluster_with_director_operator/index#proc_creating-an-overcloud-network-with-the-openstacknetconfig-CRD_OSPdO-networks[Creating networks with director Operator].
37+
endif::[]
38+
* link:https://docs.redhat.com/en/documentation/red_hat_openstack_services_on_openshift/18.0/html/deploying_red_hat_openstack_services_on_openshift/assembly_preparing-rhoso-networks_preparing[Preparing networks for Red Hat OpenStack Services on OpenShift]
39+
40+
4041
ifdef::parent-context[:context: {parent-context}]
4142
ifndef::parent-context[:!context:]

docs_user/assemblies/assembly_migrating-ceph-cluster.adoc

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ Ganesha. To migrate your {CephCluster} cluster, you must decommission the
2929
Controller nodes and move the {Ceph} daemons to a set of target nodes that are
3030
already part of the {CephCluster} cluster.
3131

32-
Before you begin the migration, complete the tasks in your {rhos_prev_long} {rhos_prev_ver} environment. For more information, see xref:red-hat-ceph-storage-prerequisites_configuring-network[{Ceph} prerequisites].
32+
== Prerequisites
33+
34+
* Before you begin the migration, complete the tasks in your {rhos_prev_long} {rhos_prev_ver} environment. For more information, see "{Ceph} prerequisites" in the Adoption overview chapter.
3335

3436
include::../modules/con_ceph-migration-dcn.adoc[leveloffset=+1]
3537

@@ -45,5 +47,9 @@ include::assembly_migrating-ceph-rbd.adoc[leveloffset=+1]
4547

4648
include::../modules/proc_migrating-ceph-post.adoc[leveloffset=+1]
4749

50+
[role="_additional-resources"]
51+
== Additional resources
52+
* xref:red-hat-ceph-storage-prerequisites_configuring-network[{Ceph} prerequisites]
53+
4854
ifdef::parent-context[:context: {parent-context}]
4955
ifndef::parent-context[:!context:]

docs_user/assemblies/assembly_migrating-ceph-monitoring-stack.adoc

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,16 @@ Ceph Manager. With {OpenStackPreviousInstaller}-deployed {Ceph}, the {Ceph} Dash
2020
The {Ceph} Dashboard containers are included through `tripleo-container-image-prepare` parameters, and high availability (HA) relies
2121
on `HAProxy` and `Pacemaker` to be deployed on the {rhos_prev_long} ({OpenStackShort}) environment. For an external {CephCluster} cluster, HA is not supported.
2222

23-
You migrate and relocate the Ceph Monitoring components to free Controller nodes. Before you begin the migration, complete the tasks in your {rhos_prev_long} {rhos_prev_ver} environment. For more information, see xref:red-hat-ceph-storage-prerequisites_configuring-network[{Ceph} prerequisites].
23+
== Prerequisites
24+
You migrate and relocate the Ceph Monitoring components to free Controller nodes. Before you begin the migration, complete the tasks in your {rhos_prev_long} {rhos_prev_ver} environment. For more information, see "{Ceph} prerequisites" in the "Adoption overview" chapter.
2425

2526

2627
include::../assemblies/assembly_migrating-monitoring-stack-to-target-nodes.adoc[leveloffset=+1]
2728

29+
[role="_additional-resources"]
30+
== Additional resources
31+
* xref:red-hat-ceph-storage-prerequisites_configuring-network[{Ceph} prerequisites]
32+
33+
2834
ifdef::parent-context[:context: {parent-context}]
2935
ifndef::parent-context[:!context:]

docs_user/assemblies/assembly_migrating-ceph-rbd.adoc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,16 @@ included in the {rhos_prev_long} control plane into the existing external Red
1414
Hat Enterprise Linux (RHEL) nodes. The external RHEL nodes typically include
1515
the Compute nodes for an HCI environment or dedicated storage nodes.
1616

17-
Before you begin the migration, complete the tasks in your {rhos_prev_long} {rhos_prev_ver} environment. For more information, see xref:red-hat-ceph-storage-prerequisites_configuring-network[{Ceph} prerequisites].
17+
== Prerequisites
18+
Before you begin the migration, complete the tasks in your {rhos_prev_long} {rhos_prev_ver} environment. For more information, see the "{Ceph} prerequisites" in the "Adoption overview" chapter.
1819

1920
include::../modules/proc_migrating-mgr-from-controller-nodes.adoc[leveloffset=+1]
2021

2122
include::assembly_migrating-mon-from-controller-nodes.adoc[leveloffset=+1]
2223

24+
[role="_additional-resources"]
25+
== Additional resources
26+
* xref:red-hat-ceph-storage-prerequisites_configuring-network[{Ceph} prerequisites]
27+
2328
ifdef::parent-context[:context: {parent-context}]
2429
ifndef::parent-context[:!context:]

docs_user/assemblies/assembly_migrating-ceph-rgw.adoc

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,19 @@ ifdef::context[:parent-context: {context}]
1010
[role="_abstract"]
1111
For Hyperconverged Infrastructure (HCI) or dedicated Storage nodes, you must migrate the Ceph Object Gateway (RGW) daemons that are included in the {rhos_prev_long} Controller nodes into the existing external Red Hat Enterprise Linux (RHEL) nodes. The external RHEL nodes typically include the Compute nodes for an HCI environment or {Ceph} nodes. Your environment must have {Ceph} {CephVernum} or later and be managed by `cephadm` or Ceph Orchestrator.
1212

13-
Before you begin the migration, complete the tasks in your {rhos_prev_long} {rhos_prev_ver} environment. For more information, see xref:red-hat-ceph-storage-prerequisites_configuring-network[{Ceph} prerequisites].
13+
== Prerequisites
14+
15+
Before you begin the migration, complete the tasks in your {rhos_prev_long} {rhos_prev_ver} environment. For more information, see the "{Ceph} prerequisites" in the "Adoption overview" chapter.
1416

1517
include::../modules/proc_migrating-the-rgw-backends.adoc[leveloffset=+1]
1618

1719
include::../modules/proc_deploying-a-ceph-ingress-daemon.adoc[leveloffset=+1]
1820

1921
include::../modules/proc_updating-the-object-storage-endpoints.adoc[leveloffset=+1]
2022

23+
[role="_additional-resources"]
24+
== Additional resources
25+
* xref:red-hat-ceph-storage-prerequisites_configuring-network[{Ceph} prerequisites]
26+
2127
ifdef::parent-context[:context: {parent-context}]
2228
ifndef::parent-context[:!context:]

docs_user/assemblies/assembly_migrating-mon-from-controller-nodes.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ deployed by {OpenStackPreviousInstaller} with a Hyperconverged Infrastructure (H
1313

1414
To migrate the Ceph Monitor daemons, you must perform the following high-level steps:
1515

16-
. xref:configuring-target-nodes-for-ceph-monitor-migration_{context}[Configure the target nodes for Ceph Monitor migration].
17-
. xref:draining-the-source-node_{context}[Drain the source node].
18-
. xref:migrating-the-ceph-monitor-ip-address_{context}[Migrate your Ceph Monitor IP addresses to the target nodes].
19-
. xref:redeploying-a-ceph-monitor-on-the-target-node_{context}[Redeploy the Ceph Monitor on the target node].
20-
. xref:verifying-the-cluster-after-ceph-mon-migration_{context}[Verify that the {Cephcluster} cluster is healthy].
16+
. Configure the target nodes for Ceph Monitor migration.
17+
. Drain the source node
18+
. Migrate your Ceph Monitor IP addresses to the target nodes
19+
. Redeploy the Ceph Monitor on the target node
20+
. Verify that the {Cephcluster} cluster is healthy
2121

2222
Repeat these steps for any additional Controller node that hosts a Ceph Monitor until you migrate all the Ceph Monitor daemons to the target nodes.
2323

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ifdef::context[:parent-context: {context}]
1010
[role="_abstract"]
1111
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.
1212

13-
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 xref:ceph-migration_adopt-control-plane[Migrate the {Ceph} cluster]. If you are not planning to migrate Ceph daemons from Controller nodes, you must perform the steps that are described in xref:deploying-a-ceph-ingress-daemon_migrating-ceph-rgw[Deploying a Ceph ingress daemon] and xref:updating-the-object-storage-endpoints_migrating-ceph-rgw[Create or update the Object Storage service endpoints].
13+
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
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.
1616

@@ -22,5 +22,11 @@ include::../modules/proc_migrating-object-storage-data-to-rhoso-nodes.adoc[level
2222

2323
include::../modules/con_troubleshooting-object-storage-migration.adoc[leveloffset=+1]
2424

25+
[role="_additional-resources"]
26+
== Additional resources
27+
* xref:ceph-migration_adopt-control-plane[Migrating the {Ceph} cluster]
28+
* xref:deploying-a-ceph-ingress-daemon_migrating-ceph-rgw[Deploying a Ceph ingress daemon]
29+
* xref:updating-the-object-storage-endpoints_migrating-ceph-rgw[Create or update the Object Storage service endpoints]
30+
2531
ifdef::parent-context[:context: {parent-context}]
2632
ifndef::parent-context[:!context:]

docs_user/assemblies/assembly_planning-your-ipam-configuration.adoc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,17 @@ to be deployed, their replica numbers, and the number of {OpenShiftShort} worker
4545

4646
Additional IP addresses might be required in future {OpenStackShort} releases, so you must plan for some extra capacity for each of the allocation pools that are used in the new environment.
4747

48-
After you determine the required IP pool size for the new deployment, you can choose to define new IP address ranges or reuse your existing IP address ranges. Regardless of the scenario, the VLAN tags in the existing deployment are reused in the new deployment. Ensure that the VLAN tags are properly retained in the new configuration. For more information, see xref:configuring-isolated-networks_configuring-network[Configuring isolated networks].
48+
After you determine the required IP pool size for the new deployment, you can choose to define new IP address ranges or reuse your existing IP address ranges. Regardless of the scenario, the VLAN tags in the existing deployment are reused in the new deployment. Ensure that the VLAN tags are properly retained in the new configuration.
4949

5050
ifeval::["{build_variant}" != "ospdo"]
5151
include::../modules/proc_using-new-subnet-ranges.adoc[leveloffset=+1]
5252
endif::[]
5353

5454
include::../modules/proc_reusing-existing-subnet-ranges.adoc[leveloffset=+1]
5555

56+
[role="_additional-resources"]
57+
== Additional resources
58+
* xref:configuring-isolated-networks_configuring-network[Configuring isolated networks]
59+
5660
ifdef::parent-context[:context: {parent-context}]
5761
ifndef::parent-context[:!context:]

0 commit comments

Comments
 (0)