diff --git a/images/150_OpenShift_VMware_on_AWS_1021_installer_FCOS.png b/images/150_OpenShift_VMware_on_AWS_1021_installer_FCOS.png new file mode 100644 index 0000000000..846a464745 Binary files /dev/null and b/images/150_OpenShift_VMware_on_AWS_1021_installer_FCOS.png differ diff --git a/images/193_OpenShift_Cluster_Install_updates_1021_oVirt.png b/images/193_OpenShift_Cluster_Install_updates_1021_oVirt.png new file mode 100644 index 0000000000..a6afcf0b64 Binary files /dev/null and b/images/193_OpenShift_Cluster_Install_updates_1021_oVirt.png differ diff --git a/installing/installing_rhv/installing-rhv-customizations.adoc b/installing/installing_rhv/installing-rhv-customizations.adoc index 942a9ef04f..299da3814e 100644 --- a/installing/installing_rhv/installing-rhv-customizations.adoc +++ b/installing/installing_rhv/installing-rhv-customizations.adoc @@ -7,7 +7,12 @@ toc::[] You can customize and install an {product-title} cluster on {rh-virtualization-first}, similar to the one shown in the following diagram. +ifndef::openshift-origin[] image::92_OpenShift_Cluster_Install_RHV_0520.png[Diagram of an {product-title} cluster on a {rh-virtualization} cluster] +endif::openshift-origin[] +ifdef::openshift-origin[] +image::193_OpenShift_Cluster_Install_updates_1021_oVirt.png[Diagram of an {product-title} cluster on a {rh-virtualization} cluster] +endif::openshift-origin[] The installation program uses installer-provisioned infrastructure to automate creating and deploying the cluster. diff --git a/installing/installing_rhv/installing-rhv-default.adoc b/installing/installing_rhv/installing-rhv-default.adoc index a203da95b7..70ea1c68bf 100644 --- a/installing/installing_rhv/installing-rhv-default.adoc +++ b/installing/installing_rhv/installing-rhv-default.adoc @@ -7,7 +7,12 @@ toc::[] 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. +ifndef::openshift-origin[] image::92_OpenShift_Cluster_Install_RHV_0520.png[Diagram of an {product-title} cluster on a {rh-virtualization} cluster] +endif::openshift-origin[] +ifdef::openshift-origin[] +image::193_OpenShift_Cluster_Install_updates_1021_oVirt.png[Diagram of an {product-title} cluster on a {rh-virtualization} cluster] +endif::openshift-origin[] The installation program uses installer-provisioned infrastructure to automate creating and deploying the cluster. diff --git a/installing/installing_rhv/installing-rhv-user-infra.adoc b/installing/installing_rhv/installing-rhv-user-infra.adoc index 31852c1b39..5196e724ea 100644 --- a/installing/installing_rhv/installing-rhv-user-infra.adoc +++ b/installing/installing_rhv/installing-rhv-user-infra.adoc @@ -10,7 +10,14 @@ customized {product-title} cluster on {rh-virtualization-first} and other infras The following diagram shows an example of a potential {product-title} cluster running on a {rh-virtualization} cluster. -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.] +ifndef::openshift-origin[] +image::92_OpenShift_Cluster_Install_RHV_0520.png[Diagram of an {product-title} cluster on a {rh-virtualization} cluster] +endif::openshift-origin[] +ifdef::openshift-origin[] +image::193_OpenShift_Cluster_Install_updates_1021_oVirt.png[Diagram of an {product-title} cluster on a {rh-virtualization} cluster] +endif::openshift-origin[] + +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.] == Prerequisites diff --git a/modules/installation-process.adoc b/modules/installation-process.adoc index 85924e0188..0b4096b1d1 100644 --- a/modules/installation-process.adoc +++ b/modules/installation-process.adoc @@ -70,8 +70,14 @@ If your cluster uses user-provisioned infrastructure, you have the option of add 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: +ifndef::openshift-origin[] .Creating the bootstrap, control plane, and compute machines image::create-nodes.png[Creating bootstrap, control plane, and compute machines] +endif::openshift-origin[] +ifdef::openshift-origin[] +.Creating the bootstrap, control plane, and compute machines +image::150_OpenShift_VMware_on_AWS_1021_installer_FCOS.png[Creating bootstrap, control plane, and compute machines] +endif::openshift-origin[] 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.