Skip to content

Commit a3f1fe2

Browse files
authored
Merge pull request #80684 from SNiemann15/ibmz_nvme_417
[OSDOCS-11036] Add NVME support for IBM Z with LPAR
2 parents 4f2ae24 + e7f70b6 commit a3f1fe2

4 files changed

+14
-8
lines changed

modules/ibmz-configure-nbde-with-static-ip.adoc

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ifeval::["{context}" == "installing-ibm-z-kvm"]
1414
:ibm-z-kvm:
1515
endif::[]
1616
ifeval::["{context}" == "installing-ibm-z-lpar"]
17-
:ibm-z:
17+
:ibm-z-lpar:
1818
endif::[]
1919
ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
2020
:ibm-z:
@@ -23,7 +23,7 @@ ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
2323
:ibm-z-kvm:
2424
endif::[]
2525
ifeval::["{context}" == "installing-restricted-networks-ibm-z-lpar"]
26-
:ibm-z:
26+
:ibm-z-lpar:
2727
endif::[]
2828

2929
:_mod-docs-content-type: PROCEDURE
@@ -129,7 +129,12 @@ rd.znet=qeth,0.0.bdd0,0.0.bdd1,0.0.bdd2,layer2=1 \
129129
rd.zfcp=0.0.5677,0x600606680g7f0056,0x034F000000000000 \// <4>
130130
zfcp.allow_lun_scan=0
131131
----
132+
ifdef::ibm-z[]
132133
<1> Specify the block device type. For installations on DASD-type disks, specify `/dev/dasda`. For installations on FCP-type disks, specify `/dev/sda`.
134+
endif::ibm-z[]
135+
ifdef::ibm-z-lpar[]
136+
<1> Specify the block device type. For installations on DASD-type disks, specify `/dev/dasda`. For installations on FCP-type disks, specify `/dev/sda`. For installations on NVMe-type disks, specify `/dev/nvme0n1`.
137+
endif::ibm-z-lpar[]
133138
<2> Specify the location of the Ignition config file. Use `master.ign` or `worker.ign`. Only HTTP and HTTPS protocols are supported.
134139
<3> Specify the location of the `rootfs` artifact for the `kernel` and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported.
135140
<4> For installations on DASD-type disks, replace with `rd.dasd=0.0.xxxx` to specify the DASD device.

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,12 @@ rd.znet=qeth,0.0.bdf0,0.0.bdf1,0.0.bdf2,layer2=1,portno=0 \
9595
rd.dasd=0.0.3490 \
9696
zfcp.allow_lun_scan=0
9797
----
98+
ifdef::ibm-z[]
9899
<1> Specify the block device type. For installations on DASD-type disks, specify `/dev/dasda`. For installations on FCP-type disks, specify `/dev/sda`.
100+
endif::ibm-z[]
101+
ifdef::ibm-z-lpar[]
102+
<1> Specify the block device type. For installations on DASD-type disks, specify `/dev/dasda`. For installations on FCP-type disks, specify `/dev/sda`. For installations on NVMe-type disks, specify `/dev/nvme0n1`.
103+
endif::ibm-z-lpar[]
99104
<2> Specify the location of the Ignition config file. Use `bootstrap.ign`, `master.ign`, or `worker.ign`. Only HTTP and HTTPS protocols are supported.
100105
<3> Specify the location of the `rootfs` artifact for the `kernel` and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported.
101106
<4> Optional: To enable secure boot, add `coreos.inst.secure_ipl`.

modules/minimum-ibm-z-system-requirements.adoc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,6 @@ endif::ibm-z-lpar[]
8888

8989
[discrete]
9090
=== Disk storage
91-
// We might need two headings:
92-
// === Disk storage for the z/VM guest virtual machines
93-
// === Disk storage for the LPARs
9491

9592
ifdef::ibm-z[]
9693
* FICON attached disk storage (DASDs). These can be z/VM minidisks, fullpack minidisks, or dedicated DASDs, all of which must be formatted as CDL, which is the default. To reach the minimum required DASD size for {op-system-first} installations, you need extended address volumes (EAV). If available, use HyperPAV to ensure optimal performance.
@@ -99,6 +96,7 @@ endif::ibm-z[]
9996
ifdef::ibm-z-lpar[]
10097
* FICON attached disk storage (DASDs). These can be dedicated DASDs that must be formatted as CDL, which is the default. To reach the minimum required DASD size for {op-system-first} installations, you need extended address volumes (EAV). If available, use HyperPAV to ensure optimal performance.
10198
* FCP attached disk storage
99+
* NVMe disk storage
102100
endif::ibm-z-lpar[]
103101

104102
[discrete]

modules/preferred-ibm-z-system-requirements.adoc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@ endif::ibm-z-lpar[]
7171

7272
[discrete]
7373
=== Disk storage
74-
// We might need two headings:
75-
// === Disk storage for the z/VM guest virtual machines
76-
// === Disk storage for the LPARs
7774

7875
ifdef::ibm-z[]
7976
* FICON attached disk storage (DASDs). These can be z/VM minidisks, fullpack minidisks, or dedicated DASDs, all of which must be formatted as CDL, which is the default. To reach the minimum required DASD size for {op-system-first} installations, you need extended address volumes (EAV). If available, use HyperPAV to ensure optimal performance.
@@ -82,6 +79,7 @@ endif::ibm-z[]
8279
ifdef::ibm-z-lpar[]
8380
* FICON attached disk storage (DASDs). These can be dedicated DASDs that must be formatted as CDL, which is the default. To reach the minimum required DASD size for {op-system-first} installations, you need extended address volumes (EAV). If available, use HyperPAV to ensure optimal performance.
8481
* FCP attached disk storage
82+
* NVMe disk storage
8583
endif::ibm-z-lpar[]
8684

8785
[discrete]

0 commit comments

Comments
 (0)