Skip to content

Commit cfaf0ad

Browse files
authored
Merge pull request #75069 from SNiemann15/nbde_bug
[OCPBUGS31073] Remove duplicate entry
2 parents 501e2d8 + 6e7e880 commit cfaf0ad

File tree

1 file changed

+19
-16
lines changed

1 file changed

+19
-16
lines changed

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

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ endif::ibm-z-kvm[]
9999
----
100100
$ coreos-installer pxe customize \
101101
/root/rhcos-bootfiles/rhcos-<release>-live-initramfs.s390x.img \
102-
--dest-device /dev/disk/by-id/scsi-<serial-number> --dest-karg-append \
103-
ip=<ip-address>::<gateway-ip>:<subnet-mask>::<network-device>:none \
104-
--dest-karg-append nameserver=<nameserver-ip> \
102+
--dest-device /dev/disk/by-id/scsi-<serial_number> --dest-karg-append \
103+
ip=<ip_address>::<gateway_ip>:<subnet_mask>::<network_device>:none \
104+
--dest-karg-append nameserver=<nameserver_ip> \
105105
--dest-karg-append rd.neednet=1 -o \
106-
/root/rhcos-bootfiles/<Node-name>-initramfs.s390x.img
106+
/root/rhcos-bootfiles/<node_name>-initramfs.s390x.img
107107
----
108108
+
109109
[NOTE]
@@ -120,35 +120,38 @@ ifndef::ibm-z-kvm[]
120120
----
121121
rd.neednet=1 \
122122
console=ttysclp0 \
123-
coreos.inst.install_dev=/dev/dasda \ <1>
123+
coreos.inst.install_dev=/dev/dasda \// <1>
124124
ignition.firstboot ignition.platform.id=metal \
125-
coreos.live.rootfs_url=http://10.19.17.25/redhat/ocp/rhcos-413.86.202302201445-0/rhcos-413.86.202302201445-0-live-rootfs.s390x.img \
126-
coreos.inst.ignition_url=http://bastion.ocp-cluster1.example.com:8080/ignition/master.ign \
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>
127127
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 \ <2>
128+
zfcp.allow_lun_scan=0 \// <4>
129129
rd.znet=qeth,0.0.bdd0,0.0.bdd1,0.0.bdd2,layer2=1 \
130-
rd.zfcp=0.0.5677,0x600606680g7f0056,0x034F000000000000 \ <3>
131-
zfcp.allow_lun_scan=0 \
132-
rd.znet=qeth,0.0.bdd0,0.0.bdd1,0.0.bdd2,layer2=1 \
133-
rd.zfcp=0.0.5677,0x600606680g7f0056,0x034F000000000000
130+
rd.zfcp=0.0.5677,0x600606680g7f0056,0x034F000000000000 \// <5>
134131
----
135132
<1> For installations on DASD-type disks, add `coreos.inst.install_dev=/dev/dasda`. Omit this value for FCP-type disks.
136-
<2> For installations on FCP-type disks, add `zfcp.allow_lun_scan=0`. Omit this value for DASD-type disks.
137-
<3> For installations on DASD-type disks, replace with `rd.dasd=0.0.3490` to specify the DASD device.
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+
138139
endif::ibm-z-kvm[]
139140
ifdef::ibm-z-kvm[]
140141
[source,terminal]
141142
----
142143
rd.neednet=1 \
143144
console=ttysclp0 \
144145
ignition.firstboot ignition.platform.id=metal \
145-
coreos.live.rootfs_url=http://10.19.17.25/redhat/ocp/rhcos-413.86.202302201445-0/rhcos-413.86.202302201445-0-live-rootfs.s390x.img \
146-
coreos.inst.ignition_url=http://bastion.ocp-cluster1.example.com:8080/ignition/master.ign \
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>
147148
ip=10.19.17.2::10.19.17.1:255.255.255.0::enbdd0:none nameserver=10.19.17.1 \
148149
zfcp.allow_lun_scan=0 \
149150
rd.znet=qeth,0.0.bdd0,0.0.bdd1,0.0.bdd2,layer2=1 \
150151
rd.zfcp=0.0.5677,0x600606680g7f0056,0x034F000000000000
151152
----
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.
152155
endif::ibm-z-kvm[]
153156
+
154157
[NOTE]

0 commit comments

Comments
 (0)