HCIDOCS-474-OCI: Integration with OCI OCP doc

openshift · Oct 8, 2024 · 7a55d39 · 7a55d39
1 parent d34d186
commit 7a55d39
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 17 deletions.
diff --git a/installing/installing_oci/installing-oci-assisted-installer.adoc b/installing/installing_oci/installing-oci-assisted-installer.adoc
@@ -52,4 +52,8 @@ include::modules/installing-troubleshooting-assisted-installer-oci.adoc[leveloff
 .Additional resources
 
 * link:https://docs.oracle.com/iaas/Content/openshift-on-oci/openshift-troubleshooting.htm[Troubleshooting {product-title} on {oci} (Oracle documentation)]
+
+////
+Not sure what this document is - checking
 * 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}]
+////
diff --git a/modules/complete-assisted-installer-oci.adoc b/modules/complete-assisted-installer-oci.adoc
@@ -11,8 +11,7 @@ After you provision {oci-first} resources and upload {product-title} custom mani
 .Prerequisites
 
 * You created a resource stack on {oci} that includes the custom manifest configuration files and {oci} Resource Manager configuration resources. See "Provisioning {oci} infrastructure for your cluster".
-////
-TEMPORARY - WILL CREATE FILES IF OK
+
 
 == Assigning node roles 
 
@@ -28,20 +27,19 @@ Following host discovery, the role of all nodes appears as *Auto-assign* by defa
 
 . Click *Next*. 
 
-
 == Adding custom manifests
 
 Add the mandatory custom manifests provided by Oracle for the integration. They are located in the `custom_ manifest/manifests/` folder, and include the following: *Do we have better descriptions for these?*
 
-** `oci-ccm.yml` - CCM manfiest
+** `oci-ccm.yml` - CCM manifest
 
 ** `oci-csi.yml` - CSI driver manifest
 
-** `machineconfig-ccm.yml` - CCM machine configuration
+** `machineconfig-ccm.yml` - CCM machine configuration manifest
 
-** `machineconfig-csi.yml` - CSI driver machine configuration
+** `machineconfig-csi.yml` - CSI driver machine configuration manifest
 
-** `machineconfig-consistent-device-path.yml` - Consistent device path machine configuration
+** `machineconfig-consistent-device-path.yml` - Consistent device path machine configuration manifest
 
 For clusters deployed on bare-metal instance (BMI) nodes using iSCSI, you must also add manifests that provide a second vNIC to be used for the iSCSI service. They are also located in `custom_ manifest/manifests/`, and include the following:
 
@@ -61,18 +59,26 @@ For clusters deployed on bare-metal instance (BMI) nodes using iSCSI, you must a
 
 .. In the *Content* section, click *Browse*. Select the manifest from the `custom_ manifest/manifests/` folder.
 
-. Click *Add another manifest*. Repeat the above substeps for each required Oracle manifest in the `custom_ manifest/manifests` folder. 
+. Click *Add another manifest*. Repeat the above substeps for each required Oracle manifest in the `custom_ manifest/manifests` folder. Then click *Next*.
+
+== Completing cluster deployment
+
+Review your configurations and start the installation. 
 
-. Complete the *Review and create* step to create your {openshift} cluster on OCI.
+.Procedure
+
+. Review the *Review and create* page to confirm the definitions.
+
+. Click *Install cluster* to to install your {openshift} cluster on OCI.
 
-. Click *Install cluster* to finalize the cluster installation.
 
 ////
+
 .Procedure
 
 . From the link:https://console.redhat.com/[{hybrid-console}] web console, go to the *Host discovery* page.
 
-. Under the *Role* column, select either `Control plane node` or `Worker` for each targeted hostname.
+. Under the *Role* column, change the default `Auto-assign` value by selecting either `Control plane node` or `Worker` for each targeted hostname.
 +
 [IMPORTANT]
 ====
@@ -86,10 +92,17 @@ Before, you can continue to the next steps, wait for each node to reach the `Rea
 .. From the *Content* section, click *Browse*, and select the CCM manifest from your drive located in `custom_manifest/manifests/oci-ccm.yml`.
 
 . Expand the next *Custom manifest* section and repeat the same steps for the following manifests:
- - CSI driver manifest: `custom_manifest/manifests/oci-csi.yml`
- - CCM machine configuration: `custom_manifest/openshift/machineconfig-ccm.yml`
- - CSI driver machine configuration: `custom_manifest/openshift/machineconfig-csi.yml`
+ - `custom_manifest/manifests/oci-csi.yml`: CSI driver manifest
+ - `custom_manifest/openshift/machineconfig-ccm.yml`: CCM machine configuration manifest 
+ - `custom_manifest/openshift/machineconfig-csi.yml`: CSI driver machine configuration manifest
+ - `machineconfig-consistent-device-path.yml`: Consistent device path machine configuration manifest 
+
+. Optional: For clusters deployed on bare-metal instance (BMI) nodes using iSCSI, add the following manifests to provide a second vNIC for the iSCSI service:
 
+ - `oci-configure-secondary-nic-worker.yml`: If the installation has compute nodes defined as BMIs.
+ - `oci-configure-secondary-nic-master.yml`: If the installation has control plane nodes defined as BMIs.
+ 
 . From the *Review and create* page, click *Install cluster* to create your {product-title} cluster on {oci}.
 
 After the cluster installation and initialization operations, the {ai-full} indicates the completion of the cluster installation operation. For more information, see "Completing the installation" section in the _{ai-full} for {product-title}_ document.
+////
diff --git a/modules/creating-oci-resources-services.adoc b/modules/creating-oci-resources-services.adoc
@@ -8,6 +8,11 @@
 
 Create {oci-first} resources and services so that you can establish infrastructure with governance standards that meets your organization's requirements.
 
+From the {oci} web console, you must create the following resources:
+
+* A compartment for better organizing, restricting access, and setting usage limits to {oci} resources.
+* An object storage bucket for safely and securely storing the discovery ISO image. You can access the image at a later stage for the purposes of booting the instances, so that you can then create your cluster.
+
 *This procedure needs enhancing??*
 
 [IMPORTANT]

diff --git a/modules/installing-oci-about-assisted-installer.adoc b/modules/installing-oci-about-assisted-installer.adoc
@@ -10,17 +10,24 @@ You can run cluster workloads on {oci-first} infrastructure that supports dedica
 
 .About the (ai-full)
 
-The {product-title} {ai-full} is a tool designed to automate the installation and management of {product-title} on the Red Hat Hybrid Cloud Console. It provides a web-based graphical interface that guides users through the installation process. If you are unfamiliar with the {ai-full}, see link:https://docs.redhat.com/en/documentation/openshift_container_platform/{product-version}/html/installing_openshift_container_platform_with_the_assisted_installer/index[Installing {product-title} with the {ai-full}].
+The {product-title} {ai-full} is a tool designed to automate the installation and management of {product-title} on the Red Hat Hybrid Cloud Console. It provides a web-based graphical interface that guides users through the installation process. If you are unfamiliar with the {ai-full}, see link:https://access.redhat.com/documentation/en-us/assisted_installer_for_openshift_container_platform/[{ai-full} for {product-title}][Installing {product-title} with the {ai-full}].
 
 .About {oci-first}
 
 {oci-first-no-rt} is a comprehensive cloud computing platform offered by Oracle, providing services that can meet your needs for regulatory compliance, performance, and cost-effectiveness. For more information, see the link:https://docs.oracle.com/en-us/iaas/Content/GSG/Concepts/baremetalintro.html[Oracle Cloud documentation].
 
+*Feel free to enhance.*
+
 .Deployment options
 
 You can use the {ai-full} to install an {product-title} cluster on the {oci} platform, deploying cloud-native components such as {oci-ccm-full} and {oci-csi-full}, and integrating your cluster with {oci} API resources such as instance node, load balancer, and storage.
 
-The integration between OCP and {oci} is certified on both virtual machines (BMs) and bare metal (BM) machines. Bare metal installations using iSCSI boot drives require a secondary vNIC. Oracle provide the secondary vNICs via custom manifests. There are two separate manifests for nodes defined as bare metal instances, one for compute nodes and one for control plane nodes.
+The integration between OCP and {oci} is certified on both virtual machines (BMs) and bare metal (BM) machines. Bare metal installations using iSCSI boot drives require a secondary vNIC. Oracle provides the secondary vNICs via custom manifests. There are two separate manifests for nodes defined as bare metal instances, one for compute nodes and one for control plane nodes.
+
+Alternatively (taken from Adrien's presentation):
+The integration between OCP and {oci} is certified on both virtual machines (BMs) and bare metal (BM) machines. In OCI, bare metal machines are diskless, and use iSCSI for their boot volume. iSCSI is a way of providing a block device over the network. In order to boot, the machines rely on iPXE, from where it gets the network settings and also the settings for accessing the storage.  
+
+There are two separate manifests for nodes defined as bare metal instances, one for compute nodes and one for control plane nodes. These are added during the installation preparation.
 
 .Performance considerations
 

diff --git a/modules/using-assisted-installer-oci-agent-iso.adoc b/modules/using-assisted-installer-oci-agent-iso.adoc
@@ -21,7 +21,7 @@ Generate a discovery ISO image and upload the image to {oci-first}, so that the
 +
 .. In the *Cluster Details* step, complete the following fields:
 +
-[cols="2,2",options="header",subs="quotes"]
+[cols="1,3",options="header",subs="quotes"]
 |===
 |Field |Action required