Skip to content

Commit 6a2911e

Browse files
authored
Merge pull request #39210 from SNiemann15/multi_nic_kvm
[BZ2024985] add multi-nic to IBM Z KVM install docs
2 parents dd5cbba + 300b99b commit 6a2911e

File tree

2 files changed

+29
-9
lines changed

2 files changed

+29
-9
lines changed

installing/installing_ibm_z/installing-ibm-z-kvm.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ include::modules/installation-ibm-z-kvm-user-infra-machines-iso.adoc[leveloffset
8282

8383
include::modules/installation-full-ibm-z-kvm-user-infra-machines-iso.adoc[leveloffset=+2]
8484

85+
include::modules/installation-user-infra-machines-static-network.adoc[leveloffset=+2]
86+
8587
include::modules/installation-installing-bare-metal.adoc[leveloffset=+1]
8688

8789
include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1]

modules/installation-user-infra-machines-static-network.adoc

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ ifeval::["{context}" == "installing-ibm-z"]
1717
:ibm-z:
1818
endif::[]
1919
ifeval::["{context}" == "installing-ibm-z-kvm"]
20-
:ibm-z:
20+
:ibm-z-kvm:
2121
endif::[]
2222
ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
2323
:ibm-z:
2424
endif::[]
2525
ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
26-
:ibm-z:
26+
:ibm-z-kvm:
2727
endif::[]
2828
ifeval::["{context}" == "installing-ibm-power"]
2929
:ibm-power:
@@ -39,15 +39,20 @@ endif::[]
3939
This section illustrates the networking configuration and other advanced options that allow you to modify the {op-system-first} manual installation 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.
4040

4141
[id="installation-user-infra-machines-routing-bonding_{context}"]
42+
ifndef::ibm-z-kvm[]
4243
== Networking and bonding options for ISO installations
44+
endif::ibm-z-kvm[]
45+
ifdef::ibm-z-kvm[]
46+
== Networking options for ISO installations
47+
endif::ibm-z-kvm[]
4348

4449
If you install {op-system} from an ISO image, you can add kernel arguments manually when you boot the image to configure networking for a node. If no networking arguments are specified, DHCP is activated in the initramfs when {op-system} detects that networking is required to fetch the Ignition config file.
4550

4651
[IMPORTANT]
4752
====
4853
When adding networking arguments manually, you must also add the `rd.neednet=1` kernel argument to bring the network up in the initramfs.
4954
====
50-
55+
ifndef::ibm-z-kvm[]
5156
The following table provides examples for configuring networking and bonding on your {op-system} nodes for ISO installations. The examples describe how to use the `ip=`, `nameserver=`, and `bond=` kernel arguments.
5257

5358
[NOTE]
@@ -58,6 +63,19 @@ Ordering is important when adding the kernel arguments: `ip=`, `nameserver=`, an
5863
The networking options are passed to the `dracut` tool during system boot. For more information about the networking options supported by `dracut`, see the `dracut.cmdline` manual page.
5964

6065
.Networking and bonding options for ISO installations
66+
endif::ibm-z-kvm[]
67+
ifdef::ibm-z-kvm[]
68+
The following table provides examples for configuring networking on your {op-system} nodes for ISO installations. The examples describe how to use the `ip=` and `nameserver=` kernel arguments.
69+
70+
[NOTE]
71+
====
72+
Ordering is important when adding the kernel arguments: `ip=` and `nameserver=`.
73+
====
74+
75+
The networking options are passed to the `dracut` tool during system boot. For more information about the networking options supported by `dracut`, see the `dracut.cmdline` manual page.
76+
77+
.Networking options for ISO installations
78+
endif::ibm-z-kvm[]
6179
|===
6280
|Description |Examples
6381

@@ -143,7 +161,7 @@ a|
143161
nameserver=1.1.1.1
144162
nameserver=8.8.8.8
145163
----
146-
164+
ifndef::ibm-z-kvm[]
147165
a|Optional: Bonding multiple network interfaces to a single interface is supported
148166
using the `bond=` option. In these two examples:
149167

@@ -190,9 +208,9 @@ ip=10.10.10.2::10.10.10.254:255.255.255.0:core0.example.com:bond0.100:none
190208
bond=bond0:em1,em2:mode=active-backup
191209
vlan=bond0.100:bond0
192210
----
193-
211+
endif::ibm-z-kvm[]
194212
|===
195-
ifndef::ibm-z,ibm-power[]
213+
ifndef::ibm-z,ibm-z-kvm,ibm-power[]
196214
[id="installation-user-infra-machines-coreos-installer-options_{context}"]
197215
== `coreos-installer` options for ISO installations
198216

@@ -395,19 +413,19 @@ a|`ignition.config.url`
395413
a|Optional: The URL of the Ignition config for the live boot. For example, this can be used to customize how `coreos-installer` is invoked, or to run code before or after the installation. This is different from `coreos.inst.ignition_url`, which is the Ignition config for the installed system.
396414
|===
397415

398-
endif::ibm-z,ibm-power[]
416+
endif::ibm-z,ibm-z-kvm,ibm-power[]
399417

400418
ifeval::["{context}" == "installing-ibm-z"]
401419
:!ibm-z:
402420
endif::[]
403421
ifeval::["{context}" == "installing-ibm-z-kvm"]
404-
:!ibm-z:
422+
:!ibm-z-kvm:
405423
endif::[]
406424
ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
407425
:!ibm-z:
408426
endif::[]
409427
ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
410-
:!ibm-z:
428+
:!ibm-z-kvm:
411429
endif::[]
412430
ifeval::["{context}" == "installing-ibm-power"]
413431
:!ibm-power:

0 commit comments

Comments
 (0)