Skip to content

Commit 169340f

Browse files
committed
OCPBUGS-30076: Fixed minor bugs with OCI docs post 4.15
1 parent 992f318 commit 169340f

20 files changed

+329
-223
lines changed

_attributes/common-attributes.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ endif::openshift-origin[]
4848
:oadp-short: OADP
4949
:oc-first: pass:quotes[OpenShift CLI (`oc`)]
5050
:product-registry: OpenShift image registry
51+
:product-mirror-registry: Mirror registry for Red Hat OpenShift
5152
:rh-storage-first: Red Hat OpenShift Data Foundation
5253
:rh-storage: OpenShift Data Foundation
5354
:rh-rhacm-first: Red Hat Advanced Cluster Management (RHACM)
@@ -266,6 +267,7 @@ endif::[]
266267
:vmw-short: vSphere
267268
//Oracle
268269
:oci-first: Oracle(R) Cloud Infrastructure (OCI)
270+
:oci-first-no-rt: Oracle Cloud Infrastructure (OCI)
269271
:oci: OCI
270272
:oci-ccm-full: Oracle Cloud Controller Manager (CCM)
271273
:oci-ccm: Oracle CCM

_topic_maps/_topic_map.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -479,9 +479,9 @@ Topics:
479479
Dir: installing_oci
480480
Distros: openshift-origin,openshift-enterprise
481481
Topics:
482-
- Name: Using the Assisted Installer to install a cluster on OCI
482+
- Name: Installing a cluster on Oracle Cloud Infrastructure by using the Assisted Installer
483483
File: installing-oci-assisted-installer
484-
- Name: Using the Agent-based Installer to install a cluster on OCI
484+
- Name: Installing a cluster on Oracle Cloud Infrastructure by using the Agent-based Installer
485485
File: installing-oci-agent-based-installer
486486
- Name: Installing on vSphere
487487
Dir: installing_vsphere

contributing_to_docs/term_glossary.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ OpenShift runs your applications.
8383
8484
The `new-app` command creates a new application from the components you specify.
8585
86-
My application has two Ruby web services connected to a database back end and a RabbitMQ message queue, as well as a python worker framework.
86+
My application has two Ruby web services connected to a database back end and a RabbitMQ message queue, and a python worker framework.
8787
8888
You can check the health of your application by adding probes to the various parts.
8989
@@ -95,7 +95,7 @@ You can host a WordPress application on OpenShift.
9595

9696
Usage: Assisted Installer
9797

98-
In Red Hat OpenShift, the Assisted Installer is an installation solution that is offered on the Red Hat Hybrid Cloud Console to provide Software-as-a-Service functionality for cluster installations.
98+
In Red Hat OpenShift, the Assisted Installer is an installation solution that is offered on the Red Hat Hybrid Cloud Console to provide Software-as-a-Service functionality for cluster installations. The Assisted Installer supports installing OpenShift Container Platform on premises in a connected environment. The Assisted Installer is used for connected deployments.
9999

100100
Do not use: AI, assisted installer
101101

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:_mod-docs-content-type: ASSEMBLY
22
[id="installing-oci-agent-based-installer"]
3-
= Installing a cluster OCI by using the Agent-based Installer
3+
= Installing a cluster on {oci-first-no-rt} by using the Agent-based Installer
44
include::_attributes/common-attributes.adoc[]
55
:context: installing-oci-agent-based-installer
66

@@ -14,43 +14,59 @@ include::modules/installing-oci-about-agent-based-installer.adoc[leveloffset=+1]
1414
[role="_additional-resources"]
1515
.Additional resources
1616

17-
* xref:../../architecture/architecture-installation.html#installation-process_architecture-installation[Installation process]
18-
* xref:../../installing/installing_platform_agnostic/installing-platform-agnostic.html#cluster-entitlements_installing-platform-agnostic[Internet access for {product-title}]
19-
* xref:../../installing/installing_with_agent_based_installer/preparing-to-install-with-agent-based-installer.html#understanding-agent-install_preparing-to-install-with-agent-based-installer[Understanding the Agent-based Installer]
20-
* See link:https://docs.oracle.com/en-us/iaas/Content/Compute/Concepts/computeoverview.htm[Overview of the Compute Service] in the Oracle documentation.
21-
* See link:https://docs.oracle.com/en-us/iaas/Content/Block/Concepts/blockvolumeperformance.htm#vpus[Volume Performance Units] in the Oracle documentation.
17+
* xref:../../architecture/architecture-installation.adoc#installation-process_architecture-installation[Installation process]
18+
* xref:../../installing/installing_platform_agnostic/installing-platform-agnostic.adoc#cluster-entitlements_installing-platform-agnostic[Internet access for {product-title}]
19+
* xref:../../installing/installing_with_agent_based_installer/preparing-to-install-with-agent-based-installer.adoc#understanding-agent-install_preparing-to-install-with-agent-based-installer[Understanding the Agent-based Installer]
20+
* link:https://docs.oracle.com/en-us/iaas/Content/Compute/Concepts/computeoverview.htm[Overview of the Compute Service (Oracle documentation)]
21+
* link:https://docs.oracle.com/en-us/iaas/Content/Block/Concepts/blockvolumeperformance.htm#vpus[Volume Performance Units (Oracle documentation)]
2222
2323
// Creating OCI infrastructure resources and services
2424
include::modules/creating-oci-infra-resources-services.adoc[leveloffset=+1]
2525

2626
[role="_additional-resources"]
2727
.Additional resources
2828

29-
See the following Oracle documentation resources:
30-
31-
* link:https://docs.oracle.com/en-us/iaas/Content/Identity/Tasks/managingcompartments.htm#ariaid-title5[Creating compartments]
32-
* link:https://docs.oracle.com/en-us/iaas/Content/Network/Tasks/create_vcn.htm[Creating a VCN]
33-
* link:https://docs.oracle.com/en-us/iaas/Content/Network/Concepts/create-nsg.htm[Creating an NSG]
34-
* link:https://docs.oracle.com/en-us/iaas/Content/ContEng/Tasks/contengdynamicgrouppolicyforselfmanagednodes.htm[Creating a dynamic group and a policy for self-managed nodes]
35-
* link:https://docs.oracle.com/en-us/iaas/Content/Identity/Tasks/managingpolicies.htm[Managing policies]
36-
* link:https://docs.oracle.com/en-us/iaas/Content/Balance/Tasks/managingloadbalancer_topic-Creating_Load_Balancers.htm[Creating a load balancer]
37-
* link:https://docs.oracle.com/en-us/iaas/Content/DNS/Tasks/record-add.htm[Adding a record to a DNS zone]
29+
* link:https://docs.oracle.com/en-us/iaas/Content/Identity/Tasks/managingcompartments.htm#ariaid-title5[Creating compartments (Oracle documentation)]
30+
* link:https://docs.oracle.com/en-us/iaas/Content/Network/Tasks/create_vcn.htm[Creating a VCN (Oracle documentation)]
31+
* link:https://docs.oracle.com/en-us/iaas/Content/Network/Concepts/create-nsg.htm[Creating an NSG (Oracle documentation)]
32+
* link:https://docs.oracle.com/en-us/iaas/Content/ContEng/Tasks/contengdynamicgrouppolicyforselfmanagednodes.htm[Creating a dynamic group and a policy for self-managed nodes (Oracle documentation)]
33+
* link:https://docs.oracle.com/en-us/iaas/Content/Identity/Tasks/managingpolicies.htm[Managing policies (Oracle documentation)]
34+
* link:https://docs.oracle.com/en-us/iaas/Content/Balance/Tasks/managingloadbalancer_topic-Creating_Load_Balancers.htm[Creating a load balancer (Oracle documentation)]
35+
* link:https://docs.oracle.com/en-us/iaas/Content/DNS/Tasks/record-add.htm[Adding a record to a DNS zone (Oracle documentation)]
3836
3937
// Creating configuration files for installing a cluster on OCI
4038
include::modules/creating-config-files-cluster-install-oci.adoc[leveloffset=+1]
4139

4240
[role="_additional-resources"]
4341
.Additional resources
4442

45-
* xref:../../installing/installing_with_agent_based_installer/installing-with-agent-based-installer.html#installing-ocp-agent-ztp_installing-with-agent-based-installer[Optional: Using ZTP manifests]
43+
* xref:../../architecture/architecture-installation.adoc#installation-overview_architecture-installation[About {product-title} installation]
44+
45+
* xref:../../installing/installing-preparing.adoc#installing-preparing-selecting-cluster-type[Selecting a cluster installation type]
46+
47+
* xref:../../installing/installing_with_agent_based_installer/preparing-to-install-with-agent-based-installer.adoc#about-the-agent-based-installer[Preparing to install with the Agent-based Installer]
48+
49+
* xref:../../installing/installing_with_agent_based_installer/installing-with-agent-based-installer.adoc#installing-ocp-agent-retrieve_installing-with-agent-based-installer[Downloading the Agent-based Installer]
50+
51+
* xref:../../installing/disconnected_install/installing-mirroring-installation-images.adoc#installation-mirror-repository_installing-mirroring-installation-images[Mirroring the {product-title} image repository]
52+
53+
* xref:../../installing/installing_with_agent_based_installer/installing-with-agent-based-installer.adoc#installing-ocp-agent-ztp_installing-with-agent-based-installer[Optional: Using ZTP manifests]
54+
55+
// Configuring your firewall
56+
include::modules/configuring-firewall.adoc[leveloffset=+1]
4657

4758
// Running your cluster on OCI
4859
include::modules/running-cluster-oci-agent-based.adoc[leveloffset=+1]
4960

61+
[role="_additional-resources"]
62+
.Additional resources
63+
64+
* xref:../../installing/installing_with_agent_based_installer/preparing-to-install-with-agent-based-installer.adoc#recommended-resources-for-topologies[Recommended resources for topologies]
65+
5066
// Verifying a succesful cluster installation on OCI
5167
include::modules/verifying-cluster-install-oci-agent-based.adoc[leveloffset=+1]
5268

5369
[role="_additional-resources"]
5470
.Additional resources
5571

56-
* xref:../../installing/installing_with_agent_based_installer/installing-with-agent-based-installer.html#installing-ocp-agent-gather-log_installing-with-agent-based-installer[Gathering log data from a failed Agent-based installation]
72+
* xref:../../installing/installing_with_agent_based_installer/installing-with-agent-based-installer.adoc#installing-ocp-agent-gather-log_installing-with-agent-based-installer[Gathering log data from a failed Agent-based installation]
Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,41 @@
11
:_mod-docs-content-type: ASSEMBLY
22
[id="installing-oci-assisted-installer"]
3-
= Using the Assisted Installer to install a cluster on OCI
3+
= Installing a cluster on {oci-first-no-rt} by using the Assisted Installer
44
include::_attributes/common-attributes.adoc[]
55
:context: installing-oci-assisted-installer
66

77
toc::[]
88

9-
From {product-title} {product-version} and later versions, you can use the Assisted Installer to install a cluster on {oci-first} by using infrastructure that you provide.
9+
From {product-title} {product-version} and later versions, you can use the {ai-full} to install a cluster on {oci-first} by using infrastructure that you provide.
1010

1111
// The Assisted Installer and OCI overview
1212
include::modules/installing-oci-about-assisted-installer.adoc[leveloffset=+1]
1313

1414
[role="_additional-resources"]
1515
.Additional resources
1616

17-
* link:https://access.redhat.com/documentation/en-us/assisted_installer_for_openshift_container_platform/2024[Assisted Installer for {product-title}]
17+
* link:https://access.redhat.com/documentation/en-us/assisted_installer_for_openshift_container_platform/2024[{ai-full} for {product-title}]
1818
* xref:../../installing/installing_platform_agnostic/installing-platform-agnostic.adoc#cluster-entitlements_installing-platform-agnostic[Internet access for {product-title}]
19-
* link:https://docs.oracle.com/en-us/iaas/Content/Block/Concepts/blockvolumeperformance.htm#vpus[Volume Performance Units]
20-
19+
* link:https://docs.oracle.com/en-us/iaas/Content/Block/Concepts/blockvolumeperformance.htm#vpus[Volume Performance Units (Oracle documentation)]
2120
2221
// Creating OCI resources
2322
include::modules/creating-oci-resources-services.adoc[leveloffset=+1]
2423

2524
[role="_additional-resources"]
2625
.Additional resources
2726

28-
See the following Oracle web-based documents:
29-
30-
* link:https://docs.oracle.com/en-us/iaas/Content/Identity/Tasks/managingcompartments.htm[Managing compartments]
31-
* link:https://docs.oracle.com/en-us/iaas/Content/Object/Concepts/objectstorageoverview.htm[Overview of Object Storage]
27+
* link:https://docs.oracle.com/en-us/iaas/Content/Identity/Tasks/managingcompartments.htm[Managing compartments (Oracle documentation)]
28+
* link:https://docs.oracle.com/en-us/iaas/Content/Object/Concepts/objectstorageoverview.htm[Overview of Object Storage (Oracle documentation)]
3229
3330
// Using the Assisted Installer to generate an OCI-compatible Agent ISO image
3431
include::modules/using-assisted-installer-oci-agent-iso.adoc[leveloffset=+1]
3532

33+
[role="_additional-resources"]
34+
.Additional resources
35+
36+
* xref:../../architecture/architecture-installation.adoc#architecture-installation[Installation and update]
37+
* xref:../../installing/install_config/configuring-firewall.adoc#configuring-firewall[Configuring your firewall]
38+
3639
// Downloading manifest files and deployment resources
3740
include::modules/downloading-manifest-files-resources-oci.adoc[leveloffset=+1]
3841

@@ -48,8 +51,7 @@ include::modules/installing-troubleshooting-assisted-installer-oci.adoc[leveloff
4851
[role="_additional-resources"]
4952
.Additional resources
5053

51-
* xref:../../installing/installing_on_prem_assisted/installing-on-prem-assisted.adoc#using-the-assisted-installer_installing-on-prem-assisted[Installing an on-premise cluster using the Assisted Installer]
52-
* link:https://access.redhat.com/documentation/en-us/assisted_installer_for_openshift_container_platform/2022/html-single/assisted_installer_for_openshift_container_platform/index[Assisted Installer for {product-title}]
53-
//* link:https://access.redhat.com/node/7038262[Using the Agent-based Installer to install a cluster on OCI]
54-
* link:https://docs.oracle.com/en-us/iaas/Content/ResourceManager/Concepts/resourcemanager.htm#ways[Ways to access Resource Manager]
55-
* link:https://docs.oracle.com/en-us/iaas/Content/ResourceManager/Tasks/create-stack.htm#top[Creating a stack] in the Oracle documentation.
54+
* xref:../../installing/installing_on_prem_assisted/installing-on-prem-assisted.adoc#using-the-assisted-installer_installing-on-prem-assisted[Installing an on-premise cluster using the {ai-full}]
55+
* link:https://access.redhat.com/documentation/en-us/assisted_installer_for_openshift_container_platform/2022/html-single/assisted_installer_for_openshift_container_platform/index[{ai-full} for {product-title}]
56+
* link:https://docs.oracle.com/en-us/iaas/Content/ResourceManager/Concepts/resourcemanager.htm#ways[Ways to access Resource Manager (Oracle documentation)]
57+
* link:https://docs.oracle.com/en-us/iaas/Content/ResourceManager/Tasks/create-stack.htm#top[Creating a stack (Oracle documentation)]
Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,37 @@
11
// Module included in the following assemblies:
22
//
3-
// * installing/installing_oci/installing-oci-assisted-installer.adoc [Using the Assisted Installer to install a cluster on OCI]
3+
// * installing/installing_oci/installing-oci-assisted-installer.adoc
44

55
:_mod-docs-content-type: PROCEDURE
66
[id="complete-assisted-installer-oci_{context}"]
77
= Completing the remaining Assisted Installer steps
88

9-
After you provision {oci-first} resources and upload {product-title} custom manifest configuration files to {oci}, you must complete the remaining cluster installation steps on the Assisted Installer before you can create an instance {oci}.
9+
After you provision {oci-first} resources and upload {product-title} custom manifest configuration files to {oci}, you must complete the remaining cluster installation steps on the {ai-full} before you can create an instance {oci}.
1010

1111
.Prerequisites
1212

13-
* You created a resource stack on {oci}, and the stack includes the custom manifest configuration files and {oci} Resource Manager configuration resources.
13+
* You created a resource stack on {oci} that includes the custom manifest configuration files and {oci} Resource Manager configuration resources. See the "Downloading manifest files and deployment resources" section.
1414
1515
.Procedure
1616

17-
. From the link:https://console.redhat.com/[Red Hat Hybrid Cloud Console] web console, go to the **Host discovery** step. Under the **Role** column, assign a node role, `Control plane node` or `Worker`, for each targeted hostname.
17+
. From the link:https://console.redhat.com/[Red Hat Hybrid Cloud Console] web console, go to the *Host discovery* page.
18+
19+
.Under the *Role* column, select either `Control plane node` or `Worker` for each targeted hostname.
1820
+
1921
[IMPORTANT]
2022
====
2123
Before, you can continue to the next steps, wait for each node to reach the `Ready` status.
2224
====
2325

24-
. Accept the default settings for the **Storage** and **Networking** steps. Click the **Next** button to go to the **Custom manifests** step.
26+
. Accept the default settings for the *Storage* and *Networking* steps, and then Click *Next*.
2527

26-
. Select the value `manifests` in the **Folder** field and enter a value in the **File name** field, such as `oci-ccm.yml`. From the **Content** section, click **Browse** and select the CCM manifest from your drive located in `custom_ manifest/manifests/oci-ccm.yml`.
28+
. On the *Custom manifests* page, in the *Folder* field, select `manifest`. This is the {ai-full} folder where you want to save the custom manifest file.
29+
.. In the *File name* field, enter a value such as `oci-ccm.yml`.
30+
.. From the *Content* section, click *Browse*, and select the CCM manifest from your drive located in `custom_manifest/manifests/oci-ccm.yml`.
2731

28-
. Expand the next **Custom manifest** section and repeat the same steps for the following manifests:
29-
- CSI driver manifest: `custom_ manifest/manifests/oci-csi.yml`
30-
- CCM machine configuration: `custom_ manifest/openshift/machineconfig-ccm.yml`
31-
- CSI driver machine configuration: `custom_ manifest/openshift/machineconfig-csi.yml`
32+
. Expand the next *Custom manifest* section and repeat the same steps for the following manifests:
33+
- CSI driver manifest: `custom_manifest/manifests/oci-csi.yml`
34+
- CCM machine configuration: `custom_manifest/openshift/machineconfig-ccm.yml`
35+
- CSI driver machine configuration: `custom_manifest/openshift/machineconfig-csi.yml`
3236

33-
. Complete the **Review and create** step to create your {product-title} cluster on {oci}. Click the **Install cluster** button to complete the cluster installation.
37+
. From the *Review and create* page, click *Install cluster* to create your {product-title} cluster on {oci}.

0 commit comments

Comments
 (0)