Skip to content

Commit

Permalink
ODSOCS-3220: Updating Bare Metal UPI installations
Browse files Browse the repository at this point in the history
  • Loading branch information
kelbrown20 committed Feb 14, 2022
1 parent 409efcf commit 8e5d6ee
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 15 deletions.
6 changes: 5 additions & 1 deletion installing/installing-preparing.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ endif::openshift-origin[]
.User-provisioned infrastructure options
|===
ifndef::openshift-origin[]
||AWS |Azure |Azure Stack Hub |GCP |{rh-openstack} |{rh-openstack} on SR-IOV |RHV |Bare metal |vSphere |VMC |IBM Z |IBM Z with {op-system-base} KVM |IBM Power |Platform agnostic
||AWS |Azure |Azure Stack Hub |GCP |{rh-openstack} |{rh-openstack} on SR-IOV |RHV |Bare metal (x86_64) |Bare metal (arm64) |vSphere |VMC |IBM Z |IBM Z with {op-system-base} KVM |IBM Power |Platform agnostic
endif::openshift-origin[]
ifdef::openshift-origin[]
||AWS |Azure |Azure Stack Hub |GCP |{rh-openstack} |{rh-openstack} on SR-IOV |oVirt |Bare metal |vSphere |VMC |IBM Z |IBM Z with {op-system-base} KVM |IBM Power |Platform agnostic
Expand All @@ -251,6 +251,7 @@ endif::openshift-origin[]
|xref:../installing/installing_openstack/installing-openstack-user-sr-iov.adoc#installing-openstack-user-sr-iov[X]
|xref:../installing/installing_rhv/installing-rhv-user-infra.adoc#installing-rhv-user-infra[X]
|xref:../installing/installing_bare_metal/installing-bare-metal.adoc#installing-bare-metal[X]
|xref:../installing/installing_bare_metal/installing-bare-metal.adoc#installing-bare-metal[X]
|xref:../installing/installing_vsphere/installing-vsphere.adoc#installing-vsphere[X]
|xref:../installing/installing_vmc/installing-vmc-user-infra.adoc#installing-vmc-user-infra[X]
|xref:../installing/installing_ibm_z/installing-ibm-z.adoc#installing-ibm-z[X]
Expand All @@ -269,6 +270,7 @@ endif::openshift-origin[]
|
|
|xref:../installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc#installing-bare-metal-network-customizations[X]
|xref:../installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc#installing-bare-metal-network-customizations[X]
|xref:../installing/installing_vsphere/installing-vsphere-network-customizations.adoc#installing-vsphere-network-customizations[X]
|xref:../installing/installing_vmc/installing-vmc-network-customizations-user-infra.adoc#installing-vmc-network-customizations-user-infra[X]
|
Expand All @@ -285,6 +287,7 @@ endif::openshift-origin[]
|
|
|xref:../installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc#installing-restricted-networks-bare-metal[X]
|
|xref:../installing/installing_vsphere/installing-restricted-networks-vsphere.adoc#installing-restricted-networks-vsphere[X]
|xref:../installing/installing_vmc/installing-restricted-networks-vmc-user-infra.adoc#installing-restricted-networks-vmc-user-infra[X]
|xref:../installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc#installing-restricted-networks-ibm-z[X]
Expand All @@ -307,6 +310,7 @@ endif::openshift-origin[]
|
|
|
|
|===

////
Expand Down
10 changes: 9 additions & 1 deletion modules/architecture-rhcos-updating-bootloader.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,21 @@ You can manually install `bootupd` by using the `bootctl` command-line tool.
# bootupctl status
----
+
.Example output
.Example output for `x86_64`
[source,terminal]
----
Component EFI
Installed: grub2-efi-x64-1:2.04-31.fc33.x86_64,shim-x64-15-8.x86_64
Update: At latest version
----
+
.Example output for `arm64`
[source, terminal]
----
Component EFI
Installed: grub2-efi-aa64-1:2.02-99.el8_4.1.aarch64,shim-aa64-15.4-2.el8_1.aarch64
Update: At latest version
----

[start=2]
. {op-system} images created without `bootupd` installed on them require an explicit adoption phase.
Expand Down
12 changes: 6 additions & 6 deletions modules/installation-user-infra-machines-advanced.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -293,16 +293,16 @@ the ISO image is booted, the embedded config will be applied automatically.
+
[source,terminal]
----
# cp rhcos-<version>-live.x86_64.iso bootstrap.ign /mnt/
# chmod 644 /mnt/rhcos-<version>-live.x86_64.iso
# cp rhcos-<version>-live.<architecture>.iso live.ign /mnt/
# chmod 644 /mnt/rhcos-<version>-live.<architecture>.iso
----

. Run the following command to embed the Ignition config into the ISO:
+
[source,terminal]
----
# ./coreos-installer iso ignition embed -i /mnt/bootstrap.ign \
/mnt/rhcos-<version>-live.x86_64.iso
# ./coreos-installer iso ignition embed -i /mnt/live.ign \
/mnt/rhcos-<version>-live.<architecture>.iso
----
+
You can now use that ISO to install {op-system} using the specified live install
Expand All @@ -317,7 +317,7 @@ Using `coreos-installer iso ignition embed` to embed a file generated by `opensh
+
[source,terminal]
----
# ./coreos-installer iso ignition show /mnt/rhcos-<version>-live.x86_64.iso > mybootstrap.ign
# ./coreos-installer iso ignition show /mnt/rhcos-<version>-live.<architecture>.iso > mylive.ign
----
+
[source,terminal]
Expand All @@ -336,7 +336,7 @@ you can reuse it, run:
+
[source,terminal]
----
# ./coreos-installer iso ignition remove /mnt/rhcos-<version>-live.x86_64.iso
# ./coreos-installer iso ignition remove /mnt/rhcos-<version>-live.<architecture>.iso
----
+
You can now embed another Ignition config into the ISO or use the ISO in its
Expand Down
9 changes: 5 additions & 4 deletions modules/installation-user-infra-machines-iso.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,15 @@ $ curl -k http://<HTTP_server>/bootstrap.ign <1>
Replace `bootstrap.ign` with `master.ign` or `worker.ign` in the command to validate that the Ignition config files for the control plane and compute nodes are also available.

ifndef::openshift-origin[]
. Obtain the {op-system} images that are required for your preferred method of installing operating system instances from the
. Obtain the {op-system} images that are required for your preferred method of installing operating system instances for your target cluster architecture from the
ifndef::ibm-power[]
link:https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.10/[{op-system} image mirror]
link:https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.10/[{op-system} (x86_64) image mirror] or
link:https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.10/[{op-system} (aarch64) image mirror] pages.
endif::ibm-power[]
ifdef::ibm-power[]
link:https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/[{op-system} image mirror]
link:https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/[{op-system} image mirror] page.
endif::ibm-power[]
page.

+
[IMPORTANT]
====
Expand Down
27 changes: 25 additions & 2 deletions modules/installation-user-infra-machines-pxe.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ ifdef::only-pxe[]
Modify the following example menu entry for your environment and verify that the image and Ignition files are properly accessible:
endif::only-pxe[]
ifndef::only-pxe[]
** For PXE:
** For PXE (`x86_64`):
endif::only-pxe[]
+
----
Expand Down Expand Up @@ -161,7 +161,7 @@ This configuration does not enable serial console access on machines with a grap
====

ifndef::only-pxe[]
** For iPXE:
** For iPXE (`x86_64` + `arm64`):
+
----
kernel http://<HTTP_server>/rhcos-<version>-live-kernel-<architecture> initrd=main coreos.live.rootfs_url=http://<HTTP_server>/rhcos-<version>-live-rootfs.<architecture>.img coreos.inst.install_dev=/dev/sda coreos.inst.ignition_url=http://<HTTP_server>/bootstrap.ign <1> <2>
Expand All @@ -182,6 +182,29 @@ For example, to use DHCP on a NIC that is named `eno1`, set `ip=eno1:dhcp`.
====
This configuration does not enable serial console access on machines with a graphical console. To configure a different console, add one or more `console=` arguments to the `kernel` line. For example, add `console=tty0 console=ttyS0` to set the first PC serial port as the primary console and the graphical console as a secondary console. For more information, see link:https://access.redhat.com/articles/7212[How does one set up a serial terminal and/or console in Red Hat Enterprise Linux?].
====
+
[NOTE]
====
To network boot the CoreOS `kernel` on `arm64` architecture, you need to use a version of iPXE build with the `IMAGE_GZIP` option enabled. See link:https://ipxe.org/buildcfg/image_gzip[`IMAGE_GZIP` option in iPXE].
====
endif::only-pxe[]

ifndef::only-pxe[]
** For PXE (with UEFI and Grub as second stage) on `arm64`:
+
----
menuentry 'Install CoreOS' {
linux rhcos-<version>-live-kernel-<architecture> coreos.live.rootfs_url=http://<HTTP_server>/rhcos-<version>-live-rootfs.<architecture>.img coreos.inst.install_dev=/dev/sda coreos.inst.ignition_url=http://<HTTP_server>/bootstrap.ign <1> <2>
initrd rhcos-<version>-live-initramfs.<architecture>.img <3>
}
----
<1> Specify the locations of the {op-system} files that you uploaded to your
HTTP/TFTP server. The `kernel` parameter value is the location of the `kernel` file on your TFTP server.
The `coreos.live.rootfs_url` parameter value is the location of the `rootfs` file, and the `coreos.inst.ignition_url` parameter value is the location of the bootstrap Ignition config file on your HTTP Server.
<2> If you use multiple NICs, specify a single interface in the `ip` option.
For example, to use DHCP on a NIC that is named `eno1`, set `ip=eno1:dhcp`.
<3> Specify the location of the `initramfs` file that you uploaded to your TFTP server.

endif::only-pxe[]

. Monitor the progress of the {op-system} installation on the console of the machine.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ a|`--insecure-ignition`
a|Allow Ignition URL without HTTPS or hash.

a|`--architecture <name>`
a|Target CPU architecture. Default is `x86_64`.
a|Target CPU architecture. Valid values are `x86_64` and `arm64`.

a|`--preserve-on-error`
a|Do not clear partition table on error.
Expand Down

0 comments on commit 8e5d6ee

Please sign in to comment.