Fix merge conflict in 4.6CP PR 26070

modules/installation-user-infra-machines-iso.adoc

@@ -15,12 +15,16 @@ ISO image to create the machines.
 
 * Obtain the Ignition config files for your cluster.
 * Have access to an HTTP server that you can access from your computer and that
-the machines that you create can access.
+the machines that you create can access. If that is not possible, you can embed
+the Ignition config you want to use into the ISO you use for installation.
 
 .Procedure
 
 . Upload the control plane, compute, and bootstrap Ignition config files that the
 installation program created to your HTTP server. Note the URLs of these files.
+As an alternative, you could embed the Ignition config into the ISO installation
+medium as described later.
+
 +
 [IMPORTANT]
 ====
@@ -43,61 +47,47 @@ You must download images with the highest version that is less than or equal
 to the {product-title} version that you install. Use the image versions
 that match your {product-title} version if they are available.
 Only use ISO images for this procedure.
-RHCOS qcow2 images are not supported for bare metal installs.
+{op-system} qcow2 images are not supported for bare metal installs.
 ====
 +
-You must download the ISO file and the RAW disk file.
-Those file names resemble the following examples:
+ISO file names resemble the following example:
 
-** ISO: `rhcos-<version>-installer.<architecture>.iso`
-** Compressed metal RAW: `rhcos-<version>-metal.<architecture>.raw.gz`
+`rhcos-<version>-installer.<architecture>.iso`
 endif::openshift-origin[]
 ifdef::openshift-origin[]
 . Obtain the {op-system} images from the
 link:https://getfedora.org/en/coreos/download?tab=metal_virtualized&stream=stable[{op-system} Downloads] page
 endif::openshift-origin[]
 
-. Upload either the RAW {op-system} image file to your HTTP server and
-note its URL.
-+
-[IMPORTANT]
-====
-If you plan to add more compute machines to your cluster after you finish
-installation, do not delete these files.
-====
-
 . Use the ISO to start the {op-system} installation. Use one of the following
 installation options:
 ** Burn the ISO image to a disk and boot it directly.
 ** Use ISO redirection via a LOM interface.
 
-. After the instance boots, press the `TAB` or `E` key to edit the kernel command line.
-. Add the parameters to the kernel command line:
+. Boot the ISO image. You can interrupt the installation boot process to
+add kernel arguments. However, for this ISO procedure you should use
+the `coreos-installer` command instead of adding kernel arguments. If you
+run the live installer without options or interruption, the installer boots up to a
+shell prompt on the live system, ready for you to install {op-system} to disk.
+
+. Review the “Advanced {op-system} bare metal installation configuration”
+section for different ways of configuring features, such as networking
+and disk partitions, before running the `coreos-installer`.
+
+. Run the `coreos-installer` command. At a minimum, you must identify
+the Ignition config file location for your node type, and the
+location of the disk you are installing to. Here is an example:
 +
 [source,terminal]
 ----
-coreos.inst=yes
-coreos.inst.install_dev=sda <1>
-coreos.inst.image_url=<bare_metal_image_URL> <2>
-coreos.inst.ignition_url=http://example.com/config.ign <3>
-ip=<dhcp or static IP address> <4> <5>
-bond=<bonded_interface> <6>
+$ coreos-installer install \
+     --ignition-url=https://host/worker.ign /dev/sda
 ----
-<1> Specify the block device of the system to install to.
-<2> Specify the URL of the RAW image that you uploaded to your server.
-<3> Specify the URL of the Ignition config file for this machine type.
-<4> Set `ip=dhcp` or set an individual static IP address (`ip=`) and DNS server (`nameserver=`) on each node.
-See _Configure advanced networking_ for details.
-<5>  If you use multiple network interfaces or DNS servers,
-see _Configure advanced networking_ for details on how to configure them.
-<6> Optionally, you can bond multiple network interfaces to a single interface
-using the `bond=` option, as described in _Configure advanced networking_.
 
-. Press Enter to complete the installation. After {op-system} installs, the system
-reboots. After the system reboots, it applies the Ignition config file that you
-specified.
+. After {op-system} installs, the system reboots. During the system reboot,
+it applies the Ignition config file that you specified.
 
-. Continue to create the machines for your cluster.
+. Continue to create the other machines for your cluster.
 +
 [IMPORTANT]
 ====