Skip to content

Commit ae7377d

Browse files
skopacz1skopacz1
authored
Merge pull request #82213 from krishnanshruthi/OCPBUGS-41987
WIP: [MULTIARCH-4995] ABI documentation updates for 4.17
2 parents 6a01be7 + bdec479 commit ae7377d

File tree

6 files changed

+104
-4
lines changed

6 files changed

+104
-4
lines changed

‎installing/installing_with_agent_based_installer/prepare-pxe-assets-agent.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ include::modules/pxe-assets-ocp-agent.adoc[leveloffset=+1]
3838
// Manually adding IBM Z agents
3939
include::modules/installing-ocp-agent-ibm-z.adoc[leveloffset=+1]
4040

41+
// Configuring network overrides in {ibm-z-title}
42+
include::modules/configuring-network-overrides-ibmz.adoc[leveloffset=+2]
43+
4144
// Adding {ibm-z-title} agents with z/VM
4245
include::modules/installing-ocp-agent-ibm-z-zvm.adoc[leveloffset=+2]
4346

‎modules/adding-ibmz-lpar-agent.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Use the following procedure to manually add {ibm-z-name} agents to your cluster
1010

1111
.Prerequisites
1212
* You have Python 3 installed.
13+
* A running file server with access to the Logical Partition (LPAR).
1314
1415
.Procedure
1516

@@ -27,13 +28,12 @@ ip=<ip>::<gateway>:<netmask>:<hostname>::none nameserver=<dns> \// <2>
2728
rd.znet=qeth,<network_adaptor_range>,layer2=1
2829
rd.<disk_type>=<adapter> \// <3>
2930
zfcp.allow_lun_scan=0
30-
ai.ip_cfg_override=1 \// <4>
31+
ai.ip_cfg_override=1 \//
3132
random.trust_cpu=on rd.luks.options=discard
3233
----
3334
<1> For the `coreos.live.rootfs_url` artifact, specify the matching `rootfs` artifact for the `kernel` and `initramfs` that you are starting. Only HTTP and HTTPS protocols are supported.
3435
<2> For the `ip` parameter, manually assign the IP address, as described in _Installing a cluster with z/VM on IBM Z and IBM LinuxONE_.
3536
<3> For installations on DASD-type disks, use `rd.dasd` to specify the DASD where {op-system-first} is to be installed. For installations on FCP-type disks, use `rd.zfcp=<adapter>,<wwpn>,<lun>` to specify the FCP disk where {op-system} is to be installed.
36-
<4> Specify this parameter when you use an Open Systems Adapter (OSA) or HiperSockets.
3737
+
3838
[NOTE]
3939
====

‎modules/configuring-network-overrides-ibmz.adoc

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * installing/installing_with_agent_based_installer/prepare-pxe-assets-agent.adoc
4+
:_mod-docs-content-type: PROCEDURE
5+
[id="configuring-network-overrides-ibm_{context}"]
6+
= Configuring network overrides in {ibm-z-title}
7+
8+
You can specify a static IP address on {ibm-z-title} machines that uses Logical Partition (LPAR) and z/VM. This is useful when the network devices do not have a static MAC address assigned to them.
9+
10+
.Procedure
11+
12+
* If you have an existing `.parm` file, edit it to include the following entry:
13+
+
14+
[source,terminal]
15+
----
16+
ai.ip_cfg_override=1
17+
----
18+
+
19+
This parameter allows the file to add the network settings to the CoreOS installer.
20+
+
21+
22+
.Example `.parm` file
23+
[source,terminal]
24+
----
25+
rd.neednet=1 cio_ignore=all,!condev
26+
console=ttysclp0
27+
coreos.live.rootfs_url=<coreos_url> <1>
28+
ip=<ip>::<gateway>:<netmask>:<hostname>::none nameserver=<dns>
29+
rd.znet=qeth,<network_adaptor_range>,layer2=1
30+
rd.<disk_type>=<adapter> <2>
31+
rd.zfcp=<adapter>,<wwpn>,<lun> random.trust_cpu=on <3>
32+
zfcp.allow_lun_scan=0
33+
ai.ip_cfg_override=1
34+
ignition.firstboot ignition.platform.id=metal
35+
random.trust_cpu=on
36+
----
37+
<1> For the `coreos.live.rootfs_url` artifact, specify the matching `rootfs` artifact for the `kernel` and `initramfs` that you are booting. Only HTTP and HTTPS protocols are supported.
38+
<2> For installations on direct access storage devices (DASD) type disks, use `rd.` to specify the DASD where {rhel-first} is to be installed. For installations on Fibre Channel Protocol (FCP) disks, use `rd.zfcp=<adapter>,<wwpn>,<lun>` to specify the FCP disk where {rhel} is to be installed.
39+
<3> Specify values for `adapter`, `wwpn`, and `lun` as in the following example: `rd.zfcp=0.0.8002,0x500507630400d1e3,0x4000404600000000`.
40+
41+
[NOTE]
42+
====
43+
The `override` parameter overrides the host's network configuration settings.
44+
====

‎modules/installing-ocp-agent-ibm-z-kvm.adoc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ endif::[]
1313

1414
Use the following procedure to manually add {ibm-z-name} agents with {op-system-base} KVM.
1515
Only use this procedure for {ibm-z-name} clusters with {op-system-base} KVM.
16-
16+
[NOTE]
17+
====
18+
The `nmstateconfig` parameter must be configured for the KVM boot.
19+
====
1720
.Procedure
1821

1922
. Boot your {op-system-base} KVM machine.

‎modules/installing-ocp-agent-ibm-z-zvm.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
Use the following procedure to manually add {ibm-z-name} agents with z/VM.
1010
Only use this procedure for {ibm-z-name} clusters with z/VM.
1111

12+
.Prerequisites
13+
14+
* A running file server with access to the guest Virtual Machines.
15+
1216
.Procedure
1317

1418
. Create a parameter file for the z/VM guest:
@@ -22,6 +26,7 @@ console=ttysclp0 \
2226
coreos.live.rootfs_url=<rootfs_url> \ <1>
2327
ip=172.18.78.2::172.18.78.1:255.255.255.0:::none nameserver=172.18.78.1 \ <2>
2428
zfcp.allow_lun_scan=0 \ <3>
29+
ai.ip_cfg_override=1 \
2530
rd.znet=qeth,0.0.bdd0,0.0.bdd1,0.0.bdd2,layer2=1 \
2631
rd.dasd=0.0.4411 \ <4>
2732
rd.zfcp=0.0.8001,0x50050763040051e3,0x4000406300000000 \ <5>

‎modules/installing-ocp-agent-ibm-z.adoc

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,49 @@ Depending on your {ibm-z-name} environment, you can choose from the following op
1818
[NOTE]
1919
====
2020
Currently, ISO boot support on {ibm-z-name} (`s390x``) is available only for {op-system-base-full} KVM, which provides the flexibility to choose either PXE or ISO-based installation. For installations with z/VM and Logical Partition (LPAR), only PXE boot is supported.
21-
====
21+
====
22+
23+
[id="networking-reqs-ibmz_{context}"]
24+
== Networking requirements for {ibm-z-title}
25+
26+
In {ibm-z-title} environments, advanced networking technologies such as Open Systems Adapter (OSA), HiperSockets, and Remote Direct Memory Access (RDMA) over Converged Ethernet (RoCE) require specific configurations that deviate from the standard network settings and those needs to be persisted for multiple boot scenarios that occur in the Agent-based Installation.
27+
28+
To persist these parameters during boot, the `ai.ip_cfg_override=1` parameter is required in the `paramline`. This parameter is used with the configured network cards to ensure a successful and efficient deployment on {ibm-z-title}.
29+
30+
The following table lists the network devices that are supported on each hypervisor for the network configuration override functionality :
31+
32+
[cols="3,2,2,2,2", options="header"]
33+
|====
34+
| Network device
35+
| z/VM
36+
| KVM
37+
| LPAR Classic
38+
| LPAR Dynamic Partition Manager (DPM)
39+
40+
| Virtual Switch
41+
| Supported ^[1]^
42+
| Not applicable ^[2]^
43+
| Not applicable
44+
| Not applicable
45+
46+
| Direct attached Open Systems Adapter (OSA)
47+
| Supported
48+
| Not required ^[3]^
49+
| Supported
50+
| Not required
51+
52+
| RDMA over Converged Ethernet (RoCE)
53+
| Not required
54+
| Not required
55+
| Not required
56+
| Not required
57+
58+
| HiperSockets
59+
| Supported
60+
| Not required
61+
| Supported
62+
| Not required
63+
|====
64+
. Supported: When the `ai.ip_cfg_override` parameter is required for the installation procedure.
65+
. Not Applicable: When a network card is not applicable to be used on the hypervisor.
66+
. Not required: When the `ai.ip_cfg_override` parameter is not required for the installation procedure.

0 commit comments

Comments
 (0)