Skip to content

[enterprise-4.6] Fix Power changes from PR26184 #26593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bobfuru merged 1 commit into from
Oct 20, 2020
Merged

[enterprise-4.6] Fix Power changes from PR26184 #26593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions installing/installing_ibm_power/installing-ibm-power.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ to use an ISO image or network PXE booting to create the machines.

include::modules/installation-user-infra-machines-iso.adoc[leveloffset=+2]

include::modules/installation-user-infra-machines-static-network.adoc[leveloffset=+3]

include::modules/installation-user-infra-machines-pxe.adoc[leveloffset=+2]

include::modules/installation-installing-bare-metal.adoc[leveloffset=+1]
Expand Down
2 changes: 1 addition & 1 deletion modules/installation-user-infra-machines-iso.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ 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”
. Review the “Advanced {op-system} installation reference”
section for different ways of configuring features, such as networking
and disk partitions, before running the `coreos-installer`.

Expand Down
26 changes: 19 additions & 7 deletions modules/installation-user-infra-machines-static-network.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,25 @@
// * installing/installing_bare_metal/installing-bare-metal.adoc
// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc
// * installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc
// * installing/installing_ibm_power/installing-ibm-power.adoc
// * installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc

[id="installation-user-infra-machines-static-network_{context}"]
= Advanced {op-system} installation reference

If you install {op-system-first} from an ISO image, you can add kernel arguments
when you boot that image to configure the node's networking.
The following table describes and illustrates how to use those kernel arguments.
This section illustrates the networking configuration and other advanced options that allow you to modify the {op-system-first} bare metal install process. The following tables describe the kernel arguments and command-line options you can use with the {op-system} live installer and the `coreos-installer` command.

[discrete]
== Routing and bonding options at {op-system} boot prompt

If you install {op-system} from an ISO image, you can add kernel arguments manually when you boot that image to configure the node's networking. If no networking arguments are used, the installation defaults to using DHCP.

[IMPORTANT]
====
When adding networking arguments, you must also add the `rd.neednet=1` kernel argument.
====

The following table describes how to use `ip=`, `nameserver=`, and `bond=` kernel arguments for live ISO installs.

.Routing and bonding options for ISO
[source,adoc]
Expand All @@ -31,14 +43,14 @@ ip=10.10.10.2::10.10.10.254:255.255.255.0:core0.example.com:enp1s0:none
nameserver=4.4.4.41
----

|Specify multiple network interfaces by specifying multiple `ip=` entries.
a|Specify multiple network interfaces by specifying multiple `ip=` entries.
a|
----
ip=10.10.10.2::10.10.10.254:255.255.255.0:core0.example.com:enp1s0:none
ip=10.10.10.3::10.10.10.254:255.255.255.0:core0.example.com:enp2s0:none
----

|You can combine DHCP
a|You can combine DHCP
and static IP configurations on systems with
multiple network interfaces.
a|
Expand All @@ -47,14 +59,14 @@ ip=enp1s0:dhcp
ip=10.10.10.2::10.10.10.254:255.255.255.0:core0.example.com:enp2s0:none
----

|You can provide multiple DNS servers by adding a `nameserver=` entry for each server.
a|You can provide multiple DNS servers by adding a `nameserver=` entry for each server.
a|
----
nameserver=1.1.1.1
nameserver=8.8.8.8
----

a|Optional: Bonding multiple network interfaces to a single interface is optionally supported
a|Optional: Bonding multiple network interfaces to a single interface is supported
using the `bond=` option. In these two examples:

* The syntax for configuring a bonded interface is: `bond=name[:network_interfaces][:options]`
Expand Down
5 changes: 2 additions & 3 deletions modules/registry-configuring-storage-baremetal.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,8 @@ registry to use storage.
ifndef::ibm-z,ibm-power[bare metal.]
ifdef::ibm-z[IBM Z.]
ifdef::ibm-power[IBM Power.]
* Persistent storage provisioned for your cluster, such as
ifndef::ibm-z[Red Hat OpenShift Container Storage.]
ifdef::ibm-z[NFS.]
ifndef::ibm-z[* Persistent storage provisioned for your cluster, such as Red Hat OpenShift Container Storage.]
ifdef::ibm-z[* Persistent storage provisioned for your cluster.]
+
[IMPORTANT]
====
Expand Down