Skip to content

Commit eda0abd

Browse files
authored
Merge pull request #38627 from mburke5678/GH36703
GH#36703 Diagram refers to RHCOS instead of FCOS
2 parents fbc8d12 + d1d79aa commit eda0abd

6 files changed

+24
-1
lines changed
58.2 KB
Loading
84 KB
Loading

installing/installing_rhv/installing-rhv-customizations.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@ toc::[]
77

88
You can customize and install an {product-title} cluster on {rh-virtualization-first}, similar to the one shown in the following diagram.
99

10+
ifndef::openshift-origin[]
1011
image::92_OpenShift_Cluster_Install_RHV_0520.png[Diagram of an {product-title} cluster on a {rh-virtualization} cluster]
12+
endif::openshift-origin[]
13+
ifdef::openshift-origin[]
14+
image::193_OpenShift_Cluster_Install_updates_1021_oVirt.png[Diagram of an {product-title} cluster on a {rh-virtualization} cluster]
15+
endif::openshift-origin[]
1116

1217
The installation program uses installer-provisioned infrastructure to automate creating and deploying the cluster.
1318

installing/installing_rhv/installing-rhv-default.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@ toc::[]
77

88
You can quickly install a default, non-customized, {product-title} cluster on a {rh-virtualization-first} cluster, similar to the one shown in the following diagram.
99

10+
ifndef::openshift-origin[]
1011
image::92_OpenShift_Cluster_Install_RHV_0520.png[Diagram of an {product-title} cluster on a {rh-virtualization} cluster]
12+
endif::openshift-origin[]
13+
ifdef::openshift-origin[]
14+
image::193_OpenShift_Cluster_Install_updates_1021_oVirt.png[Diagram of an {product-title} cluster on a {rh-virtualization} cluster]
15+
endif::openshift-origin[]
1116

1217
The installation program uses installer-provisioned infrastructure to automate creating and deploying the cluster.
1318

installing/installing_rhv/installing-rhv-user-infra.adoc

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@ customized {product-title} cluster on {rh-virtualization-first} and other infras
1010

1111
The following diagram shows an example of a potential {product-title} cluster running on a {rh-virtualization} cluster.
1212

13-
image::92_OpenShift_Cluster_Install_RHV_0520.png[Diagram of an {product-title} cluster on a {rh-virtualization} cluster. The {rh-virtualization} hosts run virtual machines that contain both control plane and compute pods. One of the hosts also runs a {rh-virtualization-engine-name} virtual machine and a bootstrap virtual machine that contains a temporary control plane pod.]
13+
ifndef::openshift-origin[]
14+
image::92_OpenShift_Cluster_Install_RHV_0520.png[Diagram of an {product-title} cluster on a {rh-virtualization} cluster]
15+
endif::openshift-origin[]
16+
ifdef::openshift-origin[]
17+
image::193_OpenShift_Cluster_Install_updates_1021_oVirt.png[Diagram of an {product-title} cluster on a {rh-virtualization} cluster]
18+
endif::openshift-origin[]
19+
20+
The {rh-virtualization} hosts run virtual machines that contain both control plane and compute pods. One of the hosts also runs a {rh-virtualization-engine-name} virtual machine and a bootstrap virtual machine that contains a temporary control plane pod.]
1421

1522
== Prerequisites
1623

modules/installation-process.adoc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,14 @@ If your cluster uses user-provisioned infrastructure, you have the option of add
7070

7171
Because each machine in the cluster requires information about the cluster when it is provisioned, {product-title} uses a temporary _bootstrap_ machine during initial configuration to provide the required information to the permanent control plane. It boots by using an Ignition config file that describes how to create the cluster. The bootstrap machine creates the control plane machines that make up the control plane. The control plane machines then create the compute machines, which are also known as worker machines. The following figure illustrates this process:
7272

73+
ifndef::openshift-origin[]
7374
.Creating the bootstrap, control plane, and compute machines
7475
image::create-nodes.png[Creating bootstrap, control plane, and compute machines]
76+
endif::openshift-origin[]
77+
ifdef::openshift-origin[]
78+
.Creating the bootstrap, control plane, and compute machines
79+
image::150_OpenShift_VMware_on_AWS_1021_installer_FCOS.png[Creating bootstrap, control plane, and compute machines]
80+
endif::openshift-origin[]
7581

7682
After the cluster machines initialize, the bootstrap machine is destroyed. All clusters use the bootstrap process to initialize the cluster, but if you provision the infrastructure for your cluster, you must complete many of the steps manually.
7783

0 commit comments

Comments
 (0)