Skip to content

Commit 3e13597

Browse files
Merge pull request #1340 from klgill/fix-ConceptLinks-Modules
fixing ConceptLinks
2 parents 5901dab + e26d2c2 commit 3e13597

25 files changed

Lines changed: 69 additions & 39 deletions

docs_user/assemblies/assembly_migrating-ceph-cluster.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ already part of the {CephCluster} cluster.
3333

3434
* 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.
3535

36-
include::../modules/con_ceph-migration-dcn.adoc[leveloffset=+1]
36+
include::../modules/ref_ceph-migration-dcn.adoc[leveloffset=+1]
3737

38-
include::../modules/con_ceph-daemon-cardinality.adoc[leveloffset=+1]
38+
include::../modules/ref_ceph-daemon-cardinality.adoc[leveloffset=+1]
3939

4040
include::assembly_migrating-ceph-monitoring-stack.adoc[leveloffset=+1]
4141

docs_user/assemblies/assembly_red-hat-ceph-storage-prerequisites.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ include::../modules/proc_completing-prerequisites-for-migrating-ceph-monitoring-
2525

2626
include::../modules/proc_completing-prerequisites-for-migrating-ceph-rgw.adoc[leveloffset=+1]
2727

28-
include::../modules/proc_completing-prerequisites-for-migrating-ceph-rbd.adoc[leveloffset=+1]
28+
include::../modules/con_completing-prerequisites-for-migrating-ceph-rbd.adoc[leveloffset=+1]
2929

3030
include::../modules/proc_creating-a-ceph-nfs-cluster.adoc[leveloffset=+1]
3131

docs_user/assemblies/assembly_rhoso-180-adoption-overview.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ include::../modules/con_adoption-limitations.adoc[leveloffset=+1]
1818

1919
//include::../modules/con_known-issues-adoption.adoc[leveloffset=+1]
2020

21-
include::../modules/con_adoption-prerequisites.adoc[leveloffset=+1]
21+
include::../modules/ref_adoption-prerequisites.adoc[leveloffset=+1]
2222

2323
include::../modules/con_adoption-guidelines.adoc[leveloffset=+1]
2424

25-
include::../modules/con_adoption-process-overview.adoc[leveloffset=+1]
25+
include::../modules/ref_adoption-process-overview.adoc[leveloffset=+1]
2626

2727
include::../modules/con_dcn-adoption-overview.adoc[leveloffset=+1]
2828

docs_user/assemblies/assembly_storage-requirements.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ Before you can deploy the services in {rhos_long}, you must review the storage r
1919

2020
include::../modules/con_storage-driver-certification.adoc[leveloffset=+1]
2121

22-
include::../modules/con_block-storage-service-requirements.adoc[leveloffset=+1]
22+
include::../modules/ref_block-storage-service-requirements.adoc[leveloffset=+1]
2323

2424
include::../modules/con_block-storage-service-limitations.adoc[leveloffset=+1]
2525

26-
include::../modules/con_openshift-preparation-for-block-storage-adoption.adoc[leveloffset=+1]
26+
include::../modules/ref_openshift-preparation-for-block-storage-adoption.adoc[leveloffset=+1]
2727

28-
include::../modules/proc_preparing-block-storage-service-by-customizing-configuration.adoc[leveloffset=+1]
28+
include::../modules/ref_preparing-block-storage-service-by-customizing-configuration.adoc[leveloffset=+1]
2929

3030
include::../modules/con_changes-to-cephFS-via-NFS.adoc[leveloffset=+1]
3131

docs_user/modules/con_bare-metal-provisioning-service-configurations.adoc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
= {bare_metal} configurations
55

66
[role="_abstract"]
7-
You configure the {bare_metal_first_ref} by using configuration snippets. For more information about configuring the control plane with the {bare_metal}, see link:{customizing-rhoso}/index[{customizing-rhoso-t}].
7+
You configure the {bare_metal_first_ref} by using configuration snippets.
88

99
Some {bare_metal} configuration is overridden in {OpenStackPreviousInstaller}, for example, PXE Loader file names are often overridden at intermediate layers. You must pay attention to the settings you apply in your {rhos_long} deployment. The `ironic-operator` applies a reasonable working default configuration, but if you override them with your prior configuration, your experience might not be ideal or your new {bare_metal} fails to operate. Similarly, additional configuration might be necessary, for example, if you enable and use additional hardware types in your `ironic.conf` file.
1010

@@ -38,3 +38,7 @@ The instances of `kernel_append_params`, formerly `pxe_append_params` in the `[p
3838

3939
[WARNING]
4040
You cannot migrate hardware types that are set with the `ironic.conf` file `enabled_hardware_types` parameter, and hardware type driver interfaces starting with `staging-` into the adopted configuration.
41+
42+
[role="_additional-resources"]
43+
.Additional resources
44+
* link:{customizing-rhoso}/index[{customizing-rhoso-t}]

docs_user/modules/con_block-storage-service-config-generation-helper-tool.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
:_mod-docs-content-type: CONCEPT
1+
:_mod-docs-content-type: REFERENCE
22
[id="block-storage-configuration-generation-helper-tool_{context}"]
33

44
= About the {block_storage} configuration generation helper tool

docs_user/modules/con_changes-to-cephFS-via-NFS.adoc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,7 @@ Before you begin the adoption, review the following information to understand th
2222

2323
* While the old `ceph-nfs` service only supported NFS version 4.1 and later, the new clustered NFS service supports NFS protocols 3 and 4.1 and later. Mixing protocol versions with an export results in unintended consequences. You should mount a given share across all clients by using a consistent NFS protocol version.
2424

25-
For more information on setting up a clustered NFS service, see xref:creating-a-ceph-nfs-cluster_ceph-prerequisites[Creating an NFS Ganesha cluster].
25+
26+
[role="_additional-resources"]
27+
.Additional resources
28+
* xref:creating-a-ceph-nfs-cluster_ceph-prerequisites[Creating an NFS Ganesha cluster]

docs_user/modules/proc_completing-prerequisites-for-migrating-ceph-rbd.adoc renamed to docs_user/modules/con_completing-prerequisites-for-migrating-ceph-rbd.adoc

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
:_mod-docs-content-type: PROCEDURE
1+
:_mod-docs-content-type: CONCEPT
22
[id="completing-prerequisites-for-rbd-migration_{context}"]
33

44
= Completing prerequisites for a {Ceph} RBD migration
@@ -7,13 +7,12 @@
77
Complete the following prerequisites before you begin the {Ceph} Rados Block Device (RBD) migration.
88

99
* The target CephStorage or ComputeHCI nodes are configured to have both `storage` and `storage_mgmt` networks. This ensures that you can use both {Ceph} public and cluster networks from the same node. From {rhos_prev_long} {rhos_prev_ver} and later you do not have to run a stack update.
10-
* NFS Ganesha is migrated from a {OpenStackPreviousInstaller} deployment to `cephadm`. For more information, see xref:creating-a-ceph-nfs-cluster_ceph-prerequisites[Creating an NFS Ganesha
11-
cluster].
10+
* NFS Ganesha is migrated from a {OpenStackPreviousInstaller} deployment to `cephadm`. For more information, see "Creating an NFS Ganesha cluster".
1211
* Ceph Metadata Server, monitoring stack, Ceph Object Gateway, and any other daemon that is deployed on Controller nodes.
1312
ifeval::["{build}" != "upstream"]
1413
* The daemons distribution follows the cardinality constraints that are
15-
described in link:https://access.redhat.com/articles/1548993[Red Hat Ceph
16-
Storage: Supported configurations].
14+
described in "Red Hat Ceph
15+
Storage: Supported configurations".
1716
endif::[]
1817
* The {Ceph} cluster is healthy, and the `ceph -s` command returns `HEALTH_OK`.
1918
* Run `os-net-config` on the bare metal node and configure additional networks:
@@ -57,3 +56,10 @@ $ openstack overcloud node provision \
5756
7: vlan11 inet 172.16.11.172/24 brd 172.16.11.255 scope global vlan11\ valid_lft forever preferred_lft forever
5857
8: vlan12 inet 172.16.12.46/24 brd 172.16.12.255 scope global vlan12\ valid_lft forever preferred_lft forever
5958
----
59+
60+
[role="_additional-resources"]
61+
.Additional resources
62+
ifeval::["{build}" != "upstream"]
63+
* link:https://access.redhat.com/articles/1548993[Red Hat Ceph Storage: Supported configurations]
64+
endif::[]
65+
* xref:creating-a-ceph-nfs-cluster_ceph-prerequisites[Creating an NFS Ganesha cluster]

docs_user/modules/con_fips-support.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@ There is a major difference with how FIPS was configured in {OpenStackPreviousIn
1010

1111
If your cluster is FIPS enabled, you must deploy a FIPS {rhocp_long} cluster to adopt your {OpenStackShort} {rhos_prev_ver} FIPS control plane.
1212

13-
For more information about enabling FIPS in {OpenShiftShort}, see link:https://docs.openshift.com/container-platform/latest/installing/installing-fips.html[Support for FIPS cryptography] in _OpenShift Container Platform Documentation_.
13+
[role="_additional-resources"]
14+
.Additional resources
15+
* link:https://docs.openshift.com/container-platform/latest/installing/installing-fips.html[Support for FIPS cryptography]

docs_user/modules/con_identity-service-authentication.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@ Red Hat does not support customized roles or policies. Syntax errors or misappli
1515

1616
After you adopt a {OpenStackPreviousInstaller}-based OpenStack deployment to a {rhos_long_noacro} deployment, the {identity_service} performs user authentication and authorization by using Secure RBAC (SRBAC). If SRBAC is already enabled, then there is no change to how you perform operations. If SRBAC is disabled, then adopting a {OpenStackPreviousInstaller}-based OpenStack deployment might change how you perform operations due to changes in API access policies.
1717

18-
For more information on SRBAC, see link:{defaultURL}/performing_security_operations/assembly_srbac-in-rhoso_performing-security-services#assembly_srbac-in-rhoso_performing-security-services[Secure role based access control in Red Hat OpenStack Services on OpenShift] in _Performing security operations_.
18+
[role="_additional-resources"]
19+
.Additional resources
20+
* link:{defaultURL}/performing_security_operations/assembly_srbac-in-rhoso_performing-security-services#assembly_srbac-in-rhoso_performing-security-services[Secure role based access control in Red Hat OpenStack Services on OpenShift]

0 commit comments

Comments
 (0)