Skip to content

[OCPBUGS-56165]IBMZ changes for Multipath support for ABI #93336

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[OCPBUGS-56165]IBMZ changes for Multipath support for ABI #93336

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
15 changes: 15 additions & 0 deletions modules/adding-ibm-z-lpar-agent.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Use the following procedure to manually add {ibm-z-name} agents to your cluster

. Create a boot parameter file for the agents.
+
--
.Example parameter file
[source,terminal]
----
Expand All @@ -35,6 +36,19 @@ random.trust_cpu=on rd.luks.options=discard
<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.
<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_.
<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.
+
[NOTE]
====
For FCP multipath configurations, provide two disks instead of one.
====
+
.Example
[source,yaml]
----
rd.zfcp=<adapter1>,<wwpn1>,<lun1> \
rd.zfcp=<adapter2>,<wwpn2>,<lun2>
----
Comment on lines +40 to +50
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you look in the preview of this PR, the addition of this note and code block breaks the formatting/order of callouts that follow this. You may want to try something like wrapping this content in an open delimiter block (see this page for more details), which will sort of put all of this content in a separate "block" of asciidoc text.

Suggested change
[NOTE]
====
For FCP multipath configurations, provide two disks instead of one.
====
+
.Example
[source,yaml]
----
rd.zfcp=<adapter1>,<wwpn1>,<lun1> \
rd.zfcp=<adapter2>,<wwpn2>,<lun2>
----
--
[NOTE]
====
For FCP multipath configurations, provide two disks instead of one.
====
+
.Example
[source,yaml]
----
rd.zfcp=<adapter1>,<wwpn1>,<lun1> \
rd.zfcp=<adapter2>,<wwpn2>,<lun2>
----
--

+
<4> To enable FIPS mode, specify `fips=1`. This entry is required in addition to setting the `fips` parameter to `true` in the `install-config.yaml` file.
+
[NOTE]
Expand All @@ -52,6 +66,7 @@ boot-artifacts
└─ agent.s390x-kernel.img
└─ agent.s390x-rootfs.img
----
--

. Rename the `boot-artifacts` file present in the `generic.ins` parameter file to match the names of the `boot-artifacts` file generated by the installation program.

Expand Down
14 changes: 14 additions & 0 deletions modules/installing-ocp-agent-ibm-z-zvm.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Only use this procedure for {ibm-z-name} clusters with z/VM.

. Create a parameter file for the z/VM guest:
+
--
.Example parameter file
+
[source,text]
Expand All @@ -41,7 +42,20 @@ coreos.inst.persistent-kargs="console=tty1 console=ttyS1,115200n8"
<3> The default is `1`. Omit this entry when using an OSA network adapter.
<4> For installations on DASD-type disks, use `rd.dasd` to specify the DASD where {op-system-first} is to be installed. Omit this entry for FCP-type disks.
<5> For installations on FCP-type disks, use `rd.zfcp=<adapter>,<wwpn>,<lun>` to specify the FCP disk where {op-system} is to be installed. Omit this entry for DASD-type disks.
+
[NOTE]
====
For FCP multipath configurations, provide two disks instead of one.
====
+
.Example
[source,yaml]
----
rd.zfcp=<adapter1>,<wwpn1>,<lun1> \
rd.zfcp=<adapter2>,<wwpn2>,<lun2>
----
Comment on lines +46 to +56
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar to the other comment, you would also want to try wrapping this content in the -- block:

Suggested change
[NOTE]
====
For FCP multipath configurations, provide two disks instead of one.
====
+
.Example
[source,yaml]
----
rd.zfcp=<adapter1>,<wwpn1>,<lun1> \
rd.zfcp=<adapter2>,<wwpn2>,<lun2>
----
[NOTE]
====
For FCP multipath configurations, provide two disks instead of one.
====
+
--
.Example
[source,yaml]
----
rd.zfcp=<adapter1>,<wwpn1>,<lun1> \
rd.zfcp=<adapter2>,<wwpn2>,<lun2>
----
--

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me try it out these suggestions

<6> To enable FIPS mode, specify `fips=1`. This entry is required in addition to setting the `fips` parameter to `true` in the `install-config.yaml` file.
--
+
Leave all other parameters unchanged.

Expand Down
11 changes: 9 additions & 2 deletions modules/installing-ocp-agent-inputs.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ When you use a disconnected mirror registry, you must add the certificate file t

. Create the `agent-config.yaml` file by running the following command:
+
--
[source,terminal]
----
$ cat > agent-config.yaml << EOF
Expand Down Expand Up @@ -182,20 +183,26 @@ hosts: // <2>
next-hop-address: 192.168.111.2
next-hop-interface: eno1
table-id: 254
ifdef::iscsi-boot[minimalISO: true <6>]
ifdef::iscsi-boot[minimalISO: true <6>]
EOF
----
+
<1> This IP address is used to determine which node performs the bootstrapping process as well as running the `assisted-service` component.
You must provide the rendezvous IP address when you do not specify at least one host's IP address in the `networkConfig` parameter. If this address is not provided, one IP address is selected from the provided hosts' `networkConfig`.
<2> Optional: Host configuration. The number of hosts defined must not exceed the total number of hosts defined in the `install-config.yaml` file, which is the sum of the values of the `compute.replicas` and `controlPlane.replicas` parameters.
<3> Optional: Overrides the hostname obtained from either the Dynamic Host Configuration Protocol (DHCP) or a reverse DNS lookup. Each host must have a unique hostname supplied by one of these methods.
<4> Enables provisioning of the {op-system-first} image to a particular device. The installation program examines the devices in the order it discovers them, and compares the discovered values with the hint values. It uses the first discovered device that matches the hint value.
+
[NOTE]
====
This parameter is mandatory for FCP multipath configurations on {ibm-z-title}.
====
+
<5> Optional: Configures the network interface of a host in NMState format.
ifdef::iscsi-boot[]
<6> Generates an ISO image without the rootfs image file, and instead provides details about where to pull the rootfs file from.
You must set this parameter to `true` to enable iSCSI booting.
endif::iscsi-boot[]
--

ifdef::pxe-boot[]

Expand Down