Skip to content

Commit 1e337be

Browse files
SNiemann15SNiemann15
committed
Align IBM Z parm files
1 parent e9a11c3 commit 1e337be

7 files changed

+76
-74
lines changed

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

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -118,40 +118,38 @@ Before first boot, you must customize the initramfs for each node in the cluster
118118
ifndef::ibm-z-kvm[]
119119
[source,terminal]
120120
----
121-
rd.neednet=1 \
121+
cio_ignore=all,!condev rd.neednet=1 \
122122
console=ttysclp0 \
123-
coreos.inst.install_dev=/dev/dasda \// <1>
123+
coreos.inst.install_dev=/dev/<block_device> \// <1>
124124
ignition.firstboot ignition.platform.id=metal \
125-
coreos.live.rootfs_url=http://<http_server>/rhcos-<version>-live-rootfs.<architecture>.img \// <2>
126-
coreos.inst.ignition_url=http://<http_server>/master.ign \// <3>
127-
ip=10.19.17.2::10.19.17.1:255.255.255.0::enbdd0:none nameserver=10.19.17.1 \
128-
zfcp.allow_lun_scan=0 \// <4>
125+
coreos.inst.ignition_url=http://<http_server>/master.ign \// <2>
126+
coreos.live.rootfs_url=http://<http_server>/rhcos-<version>-live-rootfs.<architecture>.img \// <3>
127+
ip=<ip>::<gateway>:<netmask>:<hostname>::none nameserver=<dns> \
129128
rd.znet=qeth,0.0.bdd0,0.0.bdd1,0.0.bdd2,layer2=1 \
130-
rd.zfcp=0.0.5677,0x600606680g7f0056,0x034F000000000000 \// <5>
129+
rd.zfcp=0.0.5677,0x600606680g7f0056,0x034F000000000000 \// <4>
130+
zfcp.allow_lun_scan=0
131131
----
132-
<1> For installations on DASD-type disks, add `coreos.inst.install_dev=/dev/dasda`. Omit this value for FCP-type disks.
133-
<2> Specify the location of the `rootfs` artifact for the `kernel` and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported.
134-
<3> Specify the location of the Ignition config file. Use `master.ign` or `worker.ign`. Only HTTP and HTTPS protocols are supported.
135-
<4> For installations on FCP-type disks, add `zfcp.allow_lun_scan=0`. Omit this value for DASD-type disks.
136-
<5> For installations on DASD-type disks, replace with `rd.dasd=0.0.3490` to specify the DASD device.
137-
138-
132+
<1> Specify the block device type. For installations on DASD-type disks, specify `/dev/dasda`. For installations on FCP-type disks, specify `/dev/sda`.
133+
<2> Specify the location of the Ignition config file. Use `master.ign` or `worker.ign`. Only HTTP and HTTPS protocols are supported.
134+
<3> Specify the location of the `rootfs` artifact for the `kernel` and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported.
135+
<4> For installations on DASD-type disks, replace with `rd.dasd=0.0.xxxx` to specify the DASD device.
139136
endif::ibm-z-kvm[]
140137
ifdef::ibm-z-kvm[]
141138
[source,terminal]
142139
----
143-
rd.neednet=1 \
140+
cio_ignore=all,!condev rd.neednet=1 \
144141
console=ttysclp0 \
145142
ignition.firstboot ignition.platform.id=metal \
146-
coreos.live.rootfs_url=http://<http_server>/rhcos-<version>-live-rootfs.<architecture>.img \// <1>
147-
coreos.inst.ignition_url=http://<http_server>/master.ign \// <2>
148-
ip=10.19.17.2::10.19.17.1:255.255.255.0::enbdd0:none nameserver=10.19.17.1 \
149-
zfcp.allow_lun_scan=0 \
143+
coreos.inst.ignition_url=http://<http_server>/master.ign \// <1>
144+
coreos.live.rootfs_url=http://<http_server>/rhcos-<version>-live-rootfs.<architecture>.img \// <2>
145+
ip=<ip>::<gateway>:<netmask>:<hostname>::none nameserver=<dns> \
150146
rd.znet=qeth,0.0.bdd0,0.0.bdd1,0.0.bdd2,layer2=1 \
151-
rd.zfcp=0.0.5677,0x600606680g7f0056,0x034F000000000000
147+
rd.zfcp=0.0.5677,0x600606680g7f0056,0x034F000000000000 \
148+
zfcp.allow_lun_scan=0
152149
----
153-
<1> Specify the location of the `rootfs` artifact for the `kernel` and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported.
154-
<2> Specify the location of the Ignition config file. Use `master.ign` or `worker.ign`. Only HTTP and HTTPS protocols are supported.
150+
<1> Specify the location of the Ignition config file. Use `master.ign` or `worker.ign`. Only HTTP and HTTPS protocols are supported.
151+
<2> Specify the location of the `rootfs` artifact for the `kernel` and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported.
152+
155153
endif::ibm-z-kvm[]
156154
+
157155
[NOTE]

‎modules/install-sno-ibm-z-kvm.adoc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -159,15 +159,15 @@ $ virt-install \
159159
--network network=<virt_network_parm> \
160160
--graphics none \
161161
--noautoconsole \
162-
--extra-args "ip=<ip>::<gateway>:<mask>:<hostname>::none" \
163-
--extra-args "nameserver=<name_server>" \
164-
--extra-args "ip=dhcp rd.neednet=1 ignition.platform.id=metal ignition.firstboot" \
165-
--extra-args "coreos.live.rootfs_url=<rhcos_liveos>" \// <2>
166-
--extra-args "ignition.config.url=<rhcos_ign>" \// <3>
167-
--extra-args "random.trust_cpu=on rd.luks.options=discard" \
162+
--extra-args "rd.neednet=1 ignition.platform.id=metal ignition.firstboot" \
163+
--extra-args "ignition.config.url=http://<http_server>/bootstrap.ign" \// <2>
164+
--extra-args "coreos.live.rootfs_url=http://<http_server>/rhcos-<version>-live-rootfs.<architecture>.img" \// <3>
165+
--extra-args "ip=<ip>::<gateway>:<mask>:<hostname>::none" \ <4>
166+
--extra-args "nameserver=<dns>" \
168167
--extra-args "console=ttysclp0" \
169168
--wait
170169
----
171-
<1> For the `--location` parameter, specify the location of the kernel/initrd on the HTTP or HTTPS server.
172-
<2> For the `coreos.live.rootfs_url=` artifact, specify the matching `rootfs` artifact for the `kernel` and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported.
173-
<3> For the `ignition.config.url=` parameter, specify the Ignition file for the machine role. Only HTTP and HTTPS protocols are supported.
170+
<1> For the `--location` parameter, specify the location of the kernel/initrd on the HTTP or HTTPS server.
171+
<2> Specify the location of the `bootstrap.ign` config file. Only HTTP and HTTPS protocols are supported.
172+
<3> For the `coreos.live.rootfs_url=` artifact, specify the matching `rootfs` artifact for the `kernel` and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported.
173+
<4> For the `ip=` parameter, assign the IP address manually as described in "Installing a cluster with with {op-system-base} KVM on {ibm-z-name} and {ibm-linuxone-name}".

‎modules/install-sno-ibm-z.adoc

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,20 +150,19 @@ The `rootfs` image is the same for FCP and DASD.
150150
+
151151
[source,terminal]
152152
----
153-
rd.neednet=1 \
153+
cio_ignore=all,!condev rd.neednet=1 \
154154
console=ttysclp0 \
155-
coreos.live.rootfs_url=<rhcos_liveos>:8080/rootfs.img \// <1>
156155
ignition.firstboot ignition.platform.id=metal \
157-
ignition.config.url=<rhcos_ign>:8080/ignition/bootstrap-in-place-for-live-iso.ign \// <2>
158-
ip=encbdd0:dhcp::02:00:00:02:34:02 <3>
156+
ignition.config.url=http://<http_server>:8080/ignition/bootstrap-in-place-for-live-iso.ign \// <1>
157+
coreos.live.rootfs_url=http://<http_server>/rhcos-<version>-live-rootfs.<architecture>.img \// <2>
158+
ip=<ip>::<gateway>:<mask>:<hostname>::none nameserver=<dns> \// <3>
159159
rd.znet=qeth,0.0.bdd0,0.0.bdd1,0.0.bdd2,layer2=1 \
160160
rd.dasd=0.0.4411 \// <4>
161161
rd.zfcp=0.0.8001,0x50050763040051e3,0x4000406300000000 \// <5>
162-
zfcp.allow_lun_scan=0 \
163-
rd.luks.options=discard
162+
zfcp.allow_lun_scan=0
164163
----
165-
<1> For the `coreos.live.rootfs_url=` artifact, specify the matching `rootfs` artifact for the `kernel`and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported.
166-
<2> For the `ignition.config.url=` parameter, specify the Ignition file for the machine role. Only HTTP and HTTPS protocols are supported.
164+
<1> For the `ignition.config.url=` parameter, specify the Ignition file for the machine role. Only HTTP and HTTPS protocols are supported.
165+
<2> For the `coreos.live.rootfs_url=` artifact, specify the matching `rootfs` artifact for the `kernel`and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported.
167166
<3> For the `ip=` parameter, assign the IP address automatically using DHCP or manually as described in "Installing a cluster with z/VM on {ibm-z-name} and {ibm-linuxone-name}".
168167
<4> For installations on DASD-type disks, use `rd.dasd=` to specify the DASD where {op-system} is to be installed. Omit this entry for FCP-type disks.
169168
<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.

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

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,26 @@ The file names contain the {product-title} version number. They resemble the fol
4040
The Ignition files are generated by the {product-title} installer.
4141
====
4242
. Create the new KVM guest nodes using the {op-system-base} kernel, initramfs, and Ignition files, the new disk image, and adjusted parm line arguments.
43-
** For `--location`, specify the location of the kernel/initrd on the HTTP or HTTPS server.
44-
** 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.
45-
** 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.
4643
+
4744
[source,terminal]
4845
----
4946
$ virt-install \
5047
--connect qemu:///system \
51-
--name {vm_name} \
52-
--vcpus {vcpus} \
53-
--memory {memory_mb} \
54-
--disk {vm_name}.qcow2,size={image_size| default(10,true)} \
55-
--network network={virt_network_parm} \
48+
--name <vm_name> \
49+
--memory <memory_mb> \
50+
--vcpus <vcpus> \
51+
--location <media_location>,kernel=<rhcos_kernel>,initrd=<rhcos_initrd> \ / <1>
52+
--disk <vm_name>.qcow2,size=<image_size>,cache=none,io=native \
53+
--network network=<virt_network_parm> \
5654
--boot hd \
57-
--location {media_location},kernel={rhcos_kernel},initrd={rhcos_initrd} \
58-
--extra-args "rd.neednet=1 coreos.inst.install_dev=/dev/vda coreos.live.rootfs_url={rhcos_liveos} ip={ip}::{default_gateway}:{subnet_mask_length}:{vm_name}:enc1:none:{MTU} nameserver={dns} coreos.inst.ignition_url={rhcos_ign}" \
55+
--extra-args "rd.neednet=1" \
56+
--extra-args "coreos.inst.install_dev=/dev/<block_device>" \
57+
--extra-args "coreos.inst.ignition_url=http://<http_server>/bootstrap.ign" \// <2>
58+
--extra-args "coreos.live.rootfs_url=http://<http_server>/rhcos-<version>-live-rootfs.<architecture>.img" \// <3>
59+
--extra-args "ip=<ip>::<gateway>:<netmask>:<hostname>::none nameserver=<dns>" \
5960
--noautoconsole \
6061
--wait
6162
----
63+
<1> For the `--location` parameter, specify the location of the kernel/initrd on the HTTP or HTTPS server.
64+
<2> Specify the location of the Ignition config file. Use `bootstrap.ign`, `master.ign`, or `worker.ign`. Only HTTP and HTTPS protocols are supported.
65+
<3> Specify the location of the `rootfs` artifact for the `kernel` and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported.

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ $ qemu-img create -f qcow2 -F qcow2 -b /var/lib/libvirt/images/{source_rhcos_qem
4848
----
4949
$ virt-install --noautoconsole \
5050
--connect qemu:///system \
51-
--name {vm_name} \
52-
--memory {memory} \
53-
--vcpus {vcpus} \
54-
--disk {disk} \
51+
--name <vm_name> \
52+
--memory <memory_mb> \
53+
--vcpus <vcpus> \
54+
--disk <disk> \
5555
--launchSecurity type="s390-pv" \ <1>
5656
--import \
57-
--network network={network},mac={mac} \
58-
--disk path={ign_file},format=raw,readonly=on,serial=ignition,startup_policy=optional <2>
57+
--network network=<virt_network_parm>,mac=<mac_address> \
58+
--disk path=<ign_file>,format=raw,readonly=on,serial=ignition,startup_policy=optional <2>
5959
----
6060
<1> If {ibm-name} Secure Execution is enabled, add the `launchSecurity type="s390-pv"` parameter.
61-
<2> If {ibm-name} Secure Execution is enabled, replace `serial=ignition` with `serial=ignition_crypted`.
61+
<2> If {ibm-name} Secure Execution is enabled, replace `serial=ignition` with `serial=ignition_crypted`.

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

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -84,20 +84,21 @@ Example parameter file, `bootstrap-0.parm`, for the bootstrap machine:
8484
+
8585
[source,terminal]
8686
----
87-
rd.neednet=1 \
87+
cio_ignore=all,!condev rd.neednet=1 \
8888
console=ttysclp0 \
89-
coreos.inst.install_dev=/dev/dasda \
90-
coreos.live.rootfs_url=http://<http_server>/rhcos-<version>-live-rootfs.<architecture>.img \// <1>
89+
coreos.inst.install_dev=/dev/<block_device> \// <1>
9190
coreos.inst.ignition_url=http://<http_server>/bootstrap.ign \// <2>
92-
coreos.inst.secure_ipl \// <3>
93-
ip=172.18.78.2::172.18.78.1:255.255.255.0:::none nameserver=172.18.78.1 \
91+
coreos.live.rootfs_url=http://<http_server>/rhcos-<version>-live-rootfs.<architecture>.img \// <3>
92+
coreos.inst.secure_ipl \// <4>
93+
ip=<ip>::<gateway>:<netmask>:<hostname>::none nameserver=<dns> \
9494
rd.znet=qeth,0.0.bdf0,0.0.bdf1,0.0.bdf2,layer2=1,portno=0 \
95-
zfcp.allow_lun_scan=0 \
96-
rd.dasd=0.0.3490
95+
rd.dasd=0.0.3490 \
96+
zfcp.allow_lun_scan=0
9797
----
98-
<1> Specify the location of the `rootfs` artifact for the `kernel` and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported.
98+
<1> Specify the block device type. For installations on DASD-type disks, specify `/dev/dasda`. For installations on FCP-type disks, specify `/dev/sda`.
9999
<2> Specify the location of the Ignition config file. Use `bootstrap.ign`, `master.ign`, or `worker.ign`. Only HTTP and HTTPS protocols are supported.
100-
<3> Optional: To enable secure boot, add `coreos.inst.secure_ipl`.
100+
<3> Specify the location of the `rootfs` artifact for the `kernel` and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported.
101+
<4> Optional: To enable secure boot, add `coreos.inst.secure_ipl`.
101102
+
102103
Write all options in the parameter file as a single line and make sure you have no newline characters.
103104

@@ -126,18 +127,18 @@ The following is an example parameter file `worker-1.parm` for a compute node wi
126127
+
127128
[source,terminal]
128129
----
129-
rd.neednet=1 \
130+
cio_ignore=all,!condev rd.neednet=1 \
130131
console=ttysclp0 \
131132
coreos.inst.install_dev=/dev/disk/by-id/scsi-<serial_number> \
132133
coreos.live.rootfs_url=http://<http_server>/rhcos-<version>-live-rootfs.<architecture>.img \
133134
coreos.inst.ignition_url=http://<http_server>/worker.ign \
134-
ip=172.18.78.2::172.18.78.1:255.255.255.0:::none nameserver=172.18.78.1 \
135+
ip=<ip>::<gateway>:<netmask>:<hostname>::none nameserver=<dns> \
135136
rd.znet=qeth,0.0.bdf0,0.0.bdf1,0.0.bdf2,layer2=1,portno=0 \
136-
zfcp.allow_lun_scan=0 \
137137
rd.zfcp=0.0.1987,0x50050763070bc5e3,0x4008400B00000000 \
138138
rd.zfcp=0.0.19C7,0x50050763070bc5e3,0x4008400B00000000 \
139139
rd.zfcp=0.0.1987,0x50050763071bc5e3,0x4008400B00000000 \
140-
rd.zfcp=0.0.19C7,0x50050763071bc5e3,0x4008400B00000000
140+
rd.zfcp=0.0.19C7,0x50050763071bc5e3,0x4008400B00000000 \
141+
zfcp.allow_lun_scan=0
141142
----
142143
+
143144
Write all options in the parameter file as a single line and make sure you have no newline characters.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,15 @@ The following is an example parameter file, `additional-worker-dasd.parm`:
9999
+
100100
[source,terminal]
101101
----
102-
rd.neednet=1 \
102+
cio_ignore=all,!condev rd.neednet=1 \
103103
console=ttysclp0 \
104104
coreos.inst.install_dev=/dev/dasda \
105-
coreos.live.rootfs_url=http://<http_server>/rhcos-<version>-live-rootfs.<architecture>.img \
106105
coreos.inst.ignition_url=http://<http_server>/worker.ign \
106+
coreos.live.rootfs_url=http://<http_server>/rhcos-<version>-live-rootfs.<architecture>.img \
107107
ip=<ip>::<gateway>:<netmask>:<hostname>::none nameserver=<dns> \
108108
rd.znet=qeth,0.0.bdf0,0.0.bdf1,0.0.bdf2,layer2=1,portno=0 \
109-
zfcp.allow_lun_scan=0 \
110-
rd.dasd=0.0.3490
109+
rd.dasd=0.0.3490 \
110+
zfcp.allow_lun_scan=0
111111
----
112112
+
113113
Write all options in the parameter file as a single line and make sure that you have no newline characters.
@@ -137,7 +137,7 @@ The following is an example parameter file, `additional-worker-fcp.parm` for a w
137137
+
138138
[source,terminal]
139139
----
140-
rd.neednet=1 \
140+
cio_ignore=all,!condev rd.neednet=1 \
141141
console=ttysclp0 \
142142
coreos.inst.install_dev=/dev/sda \
143143
coreos.live.rootfs_url=http://<http_server>/rhcos-<version>-live-rootfs.<architecture>.img \

0 commit comments

Comments
 (0)