RedHatQuickCourses · sarveshpandit · Sep 27, 2024 · Sep 27, 2024
diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc
@@ -5,6 +5,8 @@ Welcome to this quick course, _Deploy Mission Critical Application Platform (MCA
 This course will help you learn the basic infrastructure required for Red Hat MCAP and how to deploy nested OpenShift using OpenShift Virtualization.
 After completing this course, you will be able to deploy the MCAP solution for production environments.
 
+Duration: 6 hours, 40 minutes
+
 == Authors
 
 The PTL team acknowledges the valuable contributions of the following Red Hat associates:

diff --git a/modules/chapter1/pages/section1.adoc b/modules/chapter1/pages/section1.adoc
@@ -97,7 +97,7 @@ This is the backend shared storage for the _Tenant_ cluster.
 
 === Hub Cluster
 
-The main role of _Hub_ cluster is to deploy _Infrastructure_ clusters and _Tenant_ cluster.
+The main role of _Hub_ cluster is to deploy, configure, and secure _Infrastructure_ and _Tenant_ cluster.
 
 Deploy _Hub_ cluster as https://docs.openshift.com/container-platform/4.16/installing/installing_sno/install-sno-installing-sno.html[Single Node OpenShift (SNO) cluster,window=read-later].
 

diff --git a/modules/chapter1/pages/section2.adoc b/modules/chapter1/pages/section2.adoc
@@ -35,13 +35,19 @@ dnf install -y ansible-core
 
 . Clone the repo which holds all automation scripts and ansible playbooks.
 +
+[NOTE]
+Clone the repo in case it is not already cloned while provisioning.
++
+.Sample output:
+----
+[root@hypervisor ~]# ls
+mcap-deployment-files
+----
++
 [source,bash,role=execute]
 ----
 git clone https://github.com/RedHatQuickCourses/mcap-deployment-files.git
 ----
-+
-[NOTE]
-Clone the repo in case it is not already cloned while provisioning.
 
 . Install the required ansible collections needed for running the playbooks.
 +

diff --git a/modules/chapter2/pages/section2.adoc b/modules/chapter2/pages/section2.adoc
@@ -32,7 +32,7 @@ Cluster name: `hub`
 +
 Base domain: `lab.example.com`
 +
-Select `4.16.8` version of OpenShift from the menu.
+Select the latest version of OpenShift from the menu.
 +
 Check box the `Install single node OpenShift (SNO)`
 +
@@ -75,7 +75,7 @@ Use `Command to download the ISO` option and run the given `wget` command to dow
 +
 image::console_redhat_discovery_iso_download.png[]
 +
-[NOTE]
+[IMPORTANT]
 You will need `virt-manager` to attach this discovery ISO to the `hub` VM.
 To access the GUI of the hypervisor, you will need console access.
 
@@ -124,7 +124,7 @@ Starting applications specified in /root/.vnc/xstartup
 Log file is /root/.vnc/hypervisor:2.log
 ----
 +
-[NOTE]
+[IMPORTANT]
 As per the above output, you will mention `<hypervisor_ip_address>:2` as connection in VNC viewer.
 
 ..  Download and install VNC viewer from https://www.realvnc.com/en/connect/download/viewer/ as per your laptop or desktop operating system.

diff --git a/modules/chapter3/images/sno1_console_nncp_3.png b/modules/chapter3/images/sno1_console_nncp_3.png
diff --git a/modules/chapter3/images/sno1_console_nncp_4.png b/modules/chapter3/images/sno1_console_nncp_4.png
diff --git a/modules/chapter3/images/vnc_sno1_cluster_access_1.png b/modules/chapter3/images/vnc_sno1_cluster_access_1.png
diff --git a/modules/chapter3/images/vnc_sno1_cluster_access_2.png b/modules/chapter3/images/vnc_sno1_cluster_access_2.png
diff --git a/modules/chapter3/pages/section2.adoc b/modules/chapter3/pages/section2.adoc
@@ -12,7 +12,16 @@ image::MCAP_setup_1.png[]
 
 . Download or copy your https://console.redhat.com/openshift/install/pull-secret[pull-secret,window=read-later] and put it in `pull_secret.txt` file on the hypervisor.
 
-. Set the OpenShift `clusterimageset` to 4.16.8 on a stable channel.
+. Set the OpenShift `clusterimageset`.
++
+Here for example, it is set as `4.16.8` on `stable` channel.
++
+You can set it as the same version selected for the _Hub_ cluster.
++
+[source,bash,role=execute]
+----
+ocp_version=4.16.8
+----
 +
 This will allow you to deploy the _Infrastructure_ and _Tenant_ clusters with the same OpenShift version.
 
@@ -32,16 +41,16 @@ This will allow you to deploy the _Infrastructure_ and _Tenant_ clusters with th
     name: img4.16.10-multi-appsub
 ----
 
-.. Set the _visible_ label as _true_ and _channel_ label as _stable_ for `4.16.8` image.
+.. Set the _visible_ label as _true_ and _channel_ label as _stable_ for the image.
 +
 [source,bash,role=execute]
 ----
-oc patch clusterimagesets.hive.openshift.io img4.16.8-multi-appsub --type='json' -p='[{"op":"replace","path": "/metadata/labels/visible","value":"true"}]'
+oc patch clusterimagesets.hive.openshift.io img${ocp_version}-multi-appsub --type='json' -p='[{"op":"replace","path": "/metadata/labels/visible","value":"true"}]'
 ----
 +
 [source,bash,role=execute]
 ----
-oc patch clusterimagesets.hive.openshift.io img4.16.8-multi-appsub --type='json' -p='[{"op":"replace","path": "/metadata/labels/channel","value":"stable"}]'
+oc patch clusterimagesets.hive.openshift.io img${ocp_version}-multi-appsub --type='json' -p='[{"op":"replace","path": "/metadata/labels/channel","value":"stable"}]'
 ----
 +
 .Sample output:
@@ -103,7 +112,7 @@ Cluster set: `default`
 +
 Base domain: `lab.example.com`
 +
-Select `4.16.8` version of OpenShift from the menu.
+Select the same OpenShift version selected for the _Hub_ cluster from the menu.
 +
 Check the box `Install single node OpenShift (SNO)`.
 +
@@ -173,7 +182,7 @@ image::hub_console_sno1_accept_risk.png[]
 +
 .Sample output:
 ----
-[root@hypervisor ~]# mv Downloads/39c2b646-e122-435b-b85e-c8ec6dd18d04-discovery.iso /var/lib/libvirt/images/
+[root@hypervisor ~]# mv /root/Downloads/39c2b646-e122-435b-b85e-c8ec6dd18d04-discovery.iso /var/lib/libvirt/images/
 ----
 
 .. Boot the `sno1` VM with discovery ISO.

diff --git a/modules/chapter3/pages/section5.adoc b/modules/chapter3/pages/section5.adoc
@@ -94,12 +94,12 @@ Type: `Bridge`.
 +
 Check box the `IPv4` and select `DHCP` in `IP configuration`.
 +
-Port: `enp2s0`.
+Port: `enp8s0`.
 +
 This is the NIC, which you added in the previous section.
 +
-The NIC `enp2s0` value can be different in your environment.
-Check in VM's console from `virt-manager`.
+The NIC `enp8s0` value can be different in your environment.
+To find the NIC details, check in the VM's console from `virt-manager`.
 +
 image::sno1_console_nncp_3.png[]
 +

diff --git a/modules/chapter4/images/hub_console_tenant_add_host_discovery_iso.png b/modules/chapter4/images/hub_console_tenant_add_host_discovery_iso.png
diff --git a/modules/chapter4/images/hub_console_tenant_approve_host_1.png b/modules/chapter4/images/hub_console_tenant_approve_host_1.png
diff --git a/modules/chapter4/images/hub_console_tenant_approve_host_ready.png b/modules/chapter4/images/hub_console_tenant_approve_host_ready.png
diff --git a/modules/chapter4/images/hub_console_tenant_approve_host_ready_1.png b/modules/chapter4/images/hub_console_tenant_approve_host_ready_1.png
diff --git a/modules/chapter4/images/hub_console_tenant_automation.png b/modules/chapter4/images/hub_console_tenant_automation.png
diff --git a/modules/chapter4/images/hub_console_tenant_details_1.png b/modules/chapter4/images/hub_console_tenant_details_1.png
diff --git a/modules/chapter4/images/hub_console_tenant_download_discovery_iso.png b/modules/chapter4/images/hub_console_tenant_download_discovery_iso.png
diff --git a/modules/chapter4/images/hub_console_tenant_generate_discovery_iso.png b/modules/chapter4/images/hub_console_tenant_generate_discovery_iso.png
diff --git a/modules/chapter4/images/hub_console_tenant_networking_ready.png b/modules/chapter4/images/hub_console_tenant_networking_ready.png
diff --git a/modules/chapter4/images/hub_console_tenant_pull_secret.png b/modules/chapter4/images/hub_console_tenant_pull_secret.png
diff --git a/modules/chapter4/images/hub_console_tenant_review_create.png b/modules/chapter4/images/hub_console_tenant_review_create.png
diff --git a/modules/chapter4/images/hub_console_tenant_review_save.png b/modules/chapter4/images/hub_console_tenant_review_save.png
diff --git a/modules/chapter4/images/sno1_console_virtctl_2.png b/modules/chapter4/images/sno1_console_virtctl_2.png
diff --git a/modules/chapter4/pages/section2.adoc b/modules/chapter4/pages/section2.adoc
@@ -44,7 +44,7 @@ image::hub_console_tenant_details.png[]
 +
 Base domain: `lab.example.com`
 +
-Select `4.16.8` version of OpenShift from the menu.
+Select the same OpenShift version selected for the _Hub_ cluster from the menu.
 +
 image::hub_console_tenant_details_1.png[]
 
@@ -147,7 +147,7 @@ In the `sno1` cluster web console, from the left navigation pane; click menu:Sto
 image::sno1_console_tenant_iso_pvc.png[]
 +
 [IMPORTANT]
-Upload the discovery ISO to `sno2` and `sno3` clusters by performing the above steps.
+Upload the discovery ISO to `sno2` and `sno3` clusters by performing the above same steps.
 
 .. Boot the `tcn1.lab.example.com`, `tcn2.lab.example.com`, and `tcn3.lab.example.com` VMs with discovery ISO.
 +
@@ -240,6 +240,12 @@ image::hub_console_tenant_install_progress_3.png[]
 
 . After 7 to 10 minutes, the installation will wait for _Pending user action_.
 +
+[IMPORTANT]
+In your environment, the bootstrap role can be assigned to any of the nodes.
++
+Here the bootstrap role is assigned to the `tcn1.lab.example.com` VM.
+Hence the _Pending user action_ is performed first on other two VMs.
++
 image::hub_console_tenant_pending_user_actions.png[]
 +
 This means that you will need to disconnect the discovery ISO from the `tcn3.lab.example.com` VM and boot the `tcn3.lab.example.com` VM from disk.