Merge pull request #40058 from bobfuru/rhcos-rfe

Author: Bob Furu

installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc

@@ -51,7 +51,7 @@ include::modules/installation-infrastructure-user-infra.adoc[leveloffset=+1]
 .Additional resources
 
 * xref:../../installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc#installation-requirements-user-infra_installing-bare-metal[Requirements for a cluster with user-provisioned infrastructure]
-* xref:../../installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc#creating-machines-bare-metal[Installing {op-system} and starting the {product-title} bootstrap process]
+* xref:../../installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc#creating-machines-bare-metal_installing-bare-metal[Installing {op-system} and starting the {product-title} bootstrap process]
 * xref:../../installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc#installation-host-names-dhcp-user-infra_installing-bare-metal[Setting the cluster node hostnames through DHCP]
 * xref:../../installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc#installation-user-infra-machines-advanced_installing-bare-metal[Advanced RHCOS installation configuration]
 * xref:../../installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc#installation-network-user-infra_installing-bare-metal[Networking requirements for user-provisioned infrastructure]
@@ -93,36 +93,7 @@ include::modules/nw-operator-cr.adoc[leveloffset=+1]
 
 include::modules/installation-generate-ignition-configs.adoc[leveloffset=+1]
 
-[id="creating-machines-bare-metal-network-customization"]
-== Installing {op-system} and starting the {product-title} bootstrap process
-
-To install {product-title} on bare metal infrastructure that you provision, you must install {op-system-first} on the machines. When you install {op-system}, you must provide the Ignition config file that was generated by the {product-title} installation program for the type of machine you are installing. If you have configured suitable networking, DNS, and load balancing infrastructure, the {product-title} bootstrap process begins automatically after the {op-system} machines have rebooted.
-
-To install {op-system} on the machines, follow either the steps to use an ISO image or network PXE booting.
-
-[NOTE]
-====
-The compute node deployment steps included in this installation document are {op-system}-specific. If you choose instead to deploy {op-system-base}-based compute nodes, you take responsibility for all operating system life cycle management and maintenance, including performing system updates, applying patches, and completing all other required tasks. Use of {op-system-base} 7 compute machines is deprecated and planned for removal in a future release of {product-title} 4.
-====
-
-You can configure {op-system} during ISO and PXE installations by using the following methods:
-
-* Kernel arguments: You can use kernel arguments to provide installation-specific information. For example, you can specify the locations of the {op-system} installation files that you uploaded to your HTTP server and the location of the Ignition config file for the type of node you are installing. For a PXE installation, you can use the `APPEND` parameter to pass the arguments to the kernel of the live installer. For an ISO installation, you can interrupt the live installation boot process to add the kernel arguments. In both installation cases, you can use special `coreos.inst.*` arguments to direct the installer, as well as standard boot arguments for turning standard kernel services on or off.
-
-* Ignition configs: {product-title} Ignition config files (`*.ign`) are specific to the type of node you are installing. You pass the location of a bootstrap, control plane, or compute node Ignition config file during the {op-system} installation so that it takes effect on first boot. In special cases, you can create a separate, limited Ignition config to pass to the live system. That Ignition config could do a certain set of tasks, such as reporting success to a provisioning system after completing installation. This special Ignition config is consumed by the `coreos-installer` to be applied on first boot of the installed system. Do not provide the standard control plane and compute node Ignition configs to the live ISO directly.
-
-* `coreos-installer`: You can boot the live ISO installer to a shell prompt,
-which allows you to prepare the permanent system in a variety of ways
-before first boot. In particular, you can run the `coreos-installer`
-command to identify various artifacts to include, work with disk partitions,
-and set up networking. In some cases, you can configure features on
-the live system and copy them to the installed system.
-
-Whether to use an ISO or PXE install depends on your situation.
-A PXE install requires an available DHCP service and more preparation,
-but can make the installation process more automated. An ISO install
-is a more manual process and can be inconvenient if you are setting
-up more than a few machines.
+include::modules/creating-machines-bare-metal.adoc[leveloffset=+1]
 
 include::modules/installation-user-infra-machines-iso.adoc[leveloffset=+2]
 

installing/installing_bare_metal/installing-bare-metal.adoc

@@ -61,7 +61,7 @@ include::modules/installation-infrastructure-user-infra.adoc[leveloffset=+1]
 .Additional resources
 
 * xref:../../installing/installing_bare_metal/installing-bare-metal.adoc#installation-requirements-user-infra_installing-bare-metal[Requirements for a cluster with user-provisioned infrastructure]
-* xref:../../installing/installing_bare_metal/installing-bare-metal.adoc#creating-machines-bare-metal[Installing {op-system} and starting the {product-title} bootstrap process]
+* xref:../../installing/installing_bare_metal/installing-bare-metal.adoc#creating-machines-bare-metal_installing-bare-metal[Installing {op-system} and starting the {product-title} bootstrap process]
 * xref:../../installing/installing_bare_metal/installing-bare-metal.adoc#installation-host-names-dhcp-user-infra_installing-bare-metal[Setting the cluster node hostnames through DHCP]
 * xref:../../installing/installing_bare_metal/installing-bare-metal.adoc#installation-user-infra-machines-advanced_installing-bare-metal[Advanced RHCOS installation configuration]
 * xref:../../installing/installing_bare_metal/installing-bare-metal.adoc#installation-network-user-infra_installing-bare-metal[Networking requirements for user-provisioned infrastructure]
@@ -106,42 +106,7 @@ include::modules/installation-user-infra-generate-k8s-manifest-ignition.adoc[lev
 
 * See xref:../../backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-3-expired-certs.adoc#dr-recovering-expired-certs[Recovering from expired control plane certificates] for more information about recovering kubelet certificates.
 
-[id="creating-machines-bare-metal"]
-== Installing {op-system} and starting the {product-title} bootstrap process
-
-To install {product-title} on bare metal infrastructure that you provision, you must install {op-system-first} on the machines. When you install {op-system}, you must provide the Ignition config file that was generated by the {product-title} installation program for the type of machine you are installing. If you have configured suitable networking, DNS, and load balancing infrastructure, the {product-title} bootstrap process begins automatically after the {op-system} machines have rebooted.
-
-To install {op-system} on the machines, follow either the steps to use an ISO image or network PXE booting.
-
-[NOTE]
-====
-The compute node deployment steps included in this installation document are {op-system}-specific. If you choose instead to deploy {op-system-base}-based compute nodes, you take responsibility for all operating system life cycle management and maintenance, including performing system updates, applying patches, and completing all other required tasks. Use of {op-system-base} 7 compute machines is deprecated and planned for removal in a future release of {product-title} 4.
-====
-
-You can configure {op-system} during ISO and PXE installations by using the following methods:
-
-* Kernel arguments: You can use kernel arguments to provide installation-specific information. For example, you can specify the locations of the {op-system} installation files that you uploaded to your HTTP server and the location of the Ignition config file for the type of node you are installing. For a PXE installation, you can use the `APPEND` parameter to pass the arguments to the kernel of the live installer. For an ISO installation, you can interrupt the live installation boot process to add the kernel arguments. In both installation cases, you can use special `coreos.inst.*` arguments to direct the live installer, as well as standard installation boot arguments for turning standard kernel services on or off.
-
-* Ignition configs: {product-title} Ignition config files (`*.ign`) are specific to the type of node you are installing. You pass the location of a bootstrap, control plane, or compute node Ignition config file during the {op-system} installation so that it takes effect on first boot. In special cases, you can create a separate, limited Ignition config to pass to the live system. That Ignition config could do a certain set of tasks, such as reporting success to a provisioning system after completing installation. This special Ignition config is consumed by the `coreos-installer` to be applied on first boot of the installed system. Do not provide the standard control plane and compute node Ignition configs to the live ISO directly.
-
-* `coreos-installer`: You can boot the live ISO installer to a shell prompt,
-which allows you to prepare the permanent system in a variety of ways
-before first boot. In particular, you can run the `coreos-installer`
-command to identify various artifacts to include, work with disk partitions,
-and set up networking. In some cases, you can configure features on
-the live system and copy them to the installed system.
-
-Whether to use an ISO or PXE install depends on your situation.
-A PXE install requires an available DHCP service and more preparation,
-but can make the installation process more automated. An ISO install
-is a more manual process and can be inconvenient if you are setting
-up more than a few machines.
-
-[NOTE]
-====
-As of {product-title} 4.6, the {op-system} ISO and other installation artifacts
-provide support for installation on disks with 4K sectors.
-====
+include::modules/creating-machines-bare-metal.adoc[leveloffset=+1]
 
 include::modules/installation-user-infra-machines-iso.adoc[leveloffset=+2]
 
@@ -155,7 +120,7 @@ include::modules/rhcos-enabling-multipath.adoc[leveloffset=+2]
 
 .Additional resources
 
-* See xref:../../installing/installing_bare_metal/installing-bare-metal.adoc#creating-machines-bare-metal[Installing {op-system} and starting the {product-title} bootstrap process] for more information on using special `coreos.inst.*` arguments to direct the live installer.
+* See xref:../../installing/installing_bare_metal/installing-bare-metal.adoc#creating-machines-bare-metal_installing-bare-metal[Installing {op-system} and starting the {product-title} bootstrap process] for more information on using special `coreos.inst.*` arguments to direct the live installer.
 
 include::modules/architecture-rhcos-updating-bootloader.adoc[leveloffset=+2]
 

installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc

@@ -66,7 +66,7 @@ include::modules/installation-infrastructure-user-infra.adoc[leveloffset=+1]
 .Additional resources
 
 * xref:../../installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc#installation-requirements-user-infra_installing-bare-metal[Requirements for a cluster with user-provisioned infrastructure]
-* xref:../../installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc#creating-machines-bare-metal[Installing {op-system} and starting the {product-title} bootstrap process]
+* xref:../../installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc#creating-machines-bare-metal_installing-bare-metal[Installing {op-system} and starting the {product-title} bootstrap process]
 * xref:../../installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc#installation-host-names-dhcp-user-infra_installing-bare-metal[Setting the cluster node hostnames through DHCP]
 * xref:../../installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc#installation-user-infra-machines-advanced_installing-bare-metal[Advanced RHCOS installation configuration]
 * xref:../../installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc#installation-network-user-infra_installing-bare-metal[Networking requirements for user-provisioned infrastructure]
@@ -113,37 +113,7 @@ include::modules/installation-user-infra-generate-k8s-manifest-ignition.adoc[lev
 
 include::modules/installation-special-config-chrony.adoc[leveloffset=+1]
 
-
-[id="creating-machines-bare-metal-restricted-network"]
-== Installing {op-system} and starting the {product-title} bootstrap process
-
-To install {product-title} on bare metal infrastructure that you provision, you must install {op-system-first} on the machines. When you install {op-system}, you must provide the Ignition config file that was generated by the {product-title} installation program for the type of machine you are installing. If you have configured suitable networking, DNS, and load balancing infrastructure, the {product-title} bootstrap process begins automatically after the {op-system} machines have rebooted.
-
-To install {op-system} on the machines, follow either the steps to use an ISO image or network PXE booting.
-
-[NOTE]
-====
-The compute node deployment steps included in this installation document are {op-system}-specific. If you choose instead to deploy {op-system-base}-based compute nodes, you take responsibility for all operating system life cycle management and maintenance, including performing system updates, applying patches, and completing all other required tasks. Use of {op-system-base} 7 compute machines is deprecated and planned for removal in a future release of {product-title} 4.
-====
-
-You can configure {op-system} during ISO and PXE installations by using the following methods:
-
-* Kernel arguments: You can use kernel arguments to provide installation-specific information. For example, you can specify the locations of the {op-system} installation files that you uploaded to your HTTP server and the location of the Ignition config file for the type of node you are installing. For a PXE installation, you can use the `APPEND` parameter to pass the arguments to the kernel of the live installer. For an ISO installation, you can interrupt the live installation boot process to add the kernel arguments. In both installation cases, you can use special `coreos.inst.*` arguments to direct the live installer, as well as standard installation boot arguments for turning standard kernel services on or off.
-
-* Ignition configs: {product-title} Ignition config files (`*.ign`) are specific to the type of node you are installing. You pass the location of a bootstrap, control plane, or compute node Ignition config file during the {op-system} installation so that it takes effect on first boot. In special cases, you can create a separate, limited Ignition config to pass to the live system. That Ignition config could do a certain set of tasks, such as reporting success to a provisioning system after completing installation. This special Ignition config is consumed by the `coreos-installer` to be applied on first boot of the installed system. Do not provide the standard control plane and compute node Ignition configs to the live ISO directly.
-
-* `coreos-installer`: You can boot the live ISO installer to a shell prompt,
-which allows you to prepare the permanent system in a variety of ways
-before first boot. In particular, you can run the `coreos-installer`
-command to identify various artifacts to include, work with disk partitions,
-and set up networking. In some cases, you can configure features on
-the live system and copy them to the installed system.
-
-Whether to use an ISO or PXE install depends on your situation.
-A PXE install requires an available DHCP service and more preparation,
-but can make the installation process more automated. An ISO install
-is a more manual process and can be inconvenient if you are setting
-up more than a few machines.
+include::modules/creating-machines-bare-metal.adoc[leveloffset=+1]
 
 include::modules/installation-user-infra-machines-iso.adoc[leveloffset=+2]