Skip to content

Commit 14d9131

Browse files
authored
Merge pull request #95794 from openshift-cherrypick-robot/cherry-pick-95705-to-enterprise-4.17
[enterprise-4.17] [OCPBUGS-58314] IBM Z - Change text for network interface name
2 parents 23a143a + 3387f0c commit 14d9131

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ The rootfs image is the same for FCP and DASD.
6969
... The gateway.
7070
... The netmask.
7171
... The machine host and domain name in the form `hostname.domainname`. Omit this value to let {op-system} decide.
72-
... The network interface name. Omit this value to let {op-system} decide.
72+
... The network interface name. If you omit this value, {op-system} applies the IP configuration to all available interfaces.
7373
... If you use static IP addresses, specify `none`.
7474
** For `coreos.inst.ignition_url=`, specify the Ignition file for the machine role. Use `bootstrap.ign`, `master.ign`, or `worker.ign`. Only HTTP and HTTPS protocols are supported.
7575
** For `coreos.live.rootfs_url=`, specify the matching rootfs artifact for the kernel and initramfs you are booting. Only HTTP and HTTPS protocols are supported.

modules/machine-user-infra-machines-ibm-z.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ $ curl -LO $(oc -n openshift-machine-config-operator get configmap/coreos-bootim
7373
... The gateway.
7474
... The netmask.
7575
... The machine host and domain name in the form `hostname.domainname`. Omit this value to let {op-system} decide.
76-
... The network interface name. Omit this value to let {op-system} decide.
76+
... The network interface name. If you omit this value, {op-system} applies the IP configuration to all available interfaces.
7777
... The value `none`.
7878
** For `coreos.inst.ignition_url=`, specify the URL to the `worker.ign` file. Only HTTP and HTTPS protocols are supported.
7979
** For `coreos.live.rootfs_url=`, specify the matching rootfs artifact for the `kernel` and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported.

0 commit comments

Comments
 (0)