Skip to content

Commit c08672d

Browse files
authored
Merge pull request #63453 from jldohmann/OSDOCS-6047
OSDOCS-6047: replace non persistent device names
2 parents ee5802b + f48985b commit c08672d

13 files changed

+32
-32
lines changed

modules/bmo-getting-the-baremetalhost-resource.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ spec:
6969
hardwareProfile: unknown
7070
online: true
7171
rootDeviceHints:
72-
deviceName: /dev/sda
72+
deviceName: /dev/disk/by-id/scsi-<serial_number>
7373
userData:
7474
name: worker-user-data-managed
7575
namespace: openshift-machine-api
@@ -107,7 +107,7 @@ status:
107107
storage:
108108
- hctl: "0:0:0:0"
109109
model: VK000960GWTTB
110-
name: /dev/sda
110+
name: /dev/disk/by-id/scsi-<serial_number>
111111
sizeBytes: 960197124096
112112
type: SSD
113113
vendor: ATA
@@ -130,7 +130,7 @@ status:
130130
hardwareRAIDVolumes: null
131131
softwareRAIDVolumes: []
132132
rootDeviceHints:
133-
deviceName: /dev/sda
133+
deviceName: /dev/disk/by-id/scsi-<serial_number>
134134
state: provisioned
135135
triedCredentials:
136136
credentials:

modules/cnf-topology-aware-lifecycle-manager-backup-feature.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ nodes:
3535
role: "master"
3636
rootDeviceHints:
3737
hctl: "0:2:0:0"
38-
deviceName: /dev/sda
39-
........
40-
........
41-
#Disk /dev/sda: 893.3 GiB, 959119884288 bytes, 1873281024 sectors
38+
deviceName: /dev/disk/by-id/scsi-3600508b400105e210000900000490000
39+
...
40+
#Disk /dev/disk/by-id/scsi-3600508b400105e210000900000490000:
41+
#893.3 GiB, 959119884288 bytes, 1873281024 sectors
4242
diskPartition:
43-
- device: /dev/sda
43+
- device: /dev/disk/by-id/scsi-3600508b400105e210000900000490000
4444
partitions:
4545
- mount_point: /var/recovery
4646
size: 51200

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ endif::ibm-z-kvm[]
9191
----
9292
$ coreos-installer pxe customize \
9393
/root/rhcos-bootfiles/rhcos-<release>-live-initramfs.s390x.img \
94-
--dest-device /dev/sda --dest-karg-append \
94+
--dest-device /dev/disk/by-id/scsi-<serial-number> --dest-karg-append \
9595
ip=<ip-address>::<gateway-ip>:<subnet-mask>::<network-device>:none \
9696
--dest-karg-append nameserver=<nameserver-ip> \
9797
--dest-karg-append rd.neednet=1 -o \
@@ -159,4 +159,4 @@ ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
159159
endif::[]
160160
ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
161161
:!ibm-z-kvm:
162-
endif::[]
162+
endif::[]

modules/installation-disk-partitioning-upi-templates.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ metadata:
9393
name: 98-var-partition
9494
storage:
9595
disks:
96-
- device: /dev/<device_name> <1>
96+
- device: /dev/disk/by-id/<device_name> <1>
9797
partitions:
9898
- label: var
9999
start_mib: <partition_start_offset> <2>

modules/installation-disk-partitioning.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ metadata:
9292
name: 98-var-partition
9393
storage:
9494
disks:
95-
- device: /dev/<device_name> <1>
95+
- device: /dev/disk/by-id/<device_name> <1>
9696
partitions:
9797
- label: var
9898
start_mib: <partition_start_offset> <2>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Write all options in the parameter file as a single line and make sure you have
7979
====
8080
When you install with multiple paths, you must enable multipathing directly after the installation, not at a later point in time, as this can cause problems.
8181
====
82-
... Set the install device as: `coreos.inst.install_dev=/dev/sda`.
82+
... Set the install device as: `coreos.inst.install_dev=/dev/disk/by-id/scsi-<serial_number>`.
8383
+
8484
[NOTE]
8585
====
@@ -99,7 +99,7 @@ The following is an example parameter file `worker-1.parm` for a worker node wit
9999
----
100100
rd.neednet=1 \
101101
console=ttysclp0 \
102-
coreos.inst.install_dev=/dev/sda \
102+
coreos.inst.install_dev=/dev/disk/by-id/scsi-<serial_number> \
103103
coreos.live.rootfs_url=http://cl1.provide.example.com:8080/assets/rhcos-live-rootfs.s390x.img \
104104
coreos.inst.ignition_url=http://cl1.provide.example.com:8080/ignition/worker.ign \
105105
ip=172.18.78.2::172.18.78.1:255.255.255.0:::none nameserver=172.18.78.1 \

modules/installation-special-config-raid.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ metadata:
3535
boot_device:
3636
mirror:
3737
devices:
38-
- /dev/sda
39-
- /dev/sdb
38+
- /dev/disk/by-id/scsi-3600508b400105e210000900000490000
39+
- /dev/disk/by-id/scsi-SSEAGATE_ST373453LW_3HW1RHM6
4040
storage:
4141
disks:
42-
- device: /dev/sda
42+
- device: /dev/disk/by-id/scsi-3600508b400105e210000900000490000
4343
partitions:
4444
- label: root-1
4545
size_mib: 25000 <1>
4646
- label: var-1
47-
- device: /dev/sdb
47+
- device: /dev/disk/by-id/scsi-SSEAGATE_ST373453LW_3HW1RHM6
4848
partitions:
4949
- label: root-2
5050
size_mib: 25000 <1>

modules/installation-user-infra-machines-advanced-customizing-live-serial-console.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ $ coreos-installer iso customize rhcos-<version>-live.x86_64.iso \
2323
--dest-ignition <path> \//<1>
2424
--dest-console tty0 \//<2>
2525
--dest-console ttyS0,<options> \//<3>
26-
--dest-device /dev/sda <4>
26+
--dest-device /dev/disk/by-id/scsi-<serial_number> <4>
2727
----
2828
+
2929
<1> The location of the Ignition config to install.
3030
<2> The desired secondary console. In this case, the graphical console. Omitting this option will disable the graphical console.
3131
<3> The desired primary console. In this case, the serial console. The `options` field defines the baud rate and other settings. A common value for this field is `115200n8`. If no options are provided, the default kernel value of `9600n8` is used. For more information on the format of this option, see the link:https://www.kernel.org/doc/html/latest/admin-guide/serial-console.html[Linux kernel serial console] documentation.
32-
<4> The specified disk to install to. In this case, `/dev/sda`. If you omit this option, the {boot-media} automatically runs the installation program which will fail unless you also specify the `coreos.inst.install_dev` kernel argument.
32+
<4> The specified disk to install to. If you omit this option, the {boot-media} automatically runs the installation program which will fail unless you also specify the `coreos.inst.install_dev` kernel argument.
3333
+
3434
[NOTE]
3535
====
@@ -58,14 +58,14 @@ $ coreos-installer pxe customize rhcos-<version>-live-initramfs.x86_64.img \
5858
--dest-ignition <path> \//<1>
5959
--dest-console tty0 \//<2>
6060
--dest-console ttyS0,<options> \//<3>
61-
--dest-device /dev/sda \//<4>
61+
--dest-device /dev/disk/by-id/scsi-<serial_number> \//<4>
6262
-o rhcos-<version>-custom-initramfs.x86_64.img
6363
----
6464
+
6565
<1> The location of the Ignition config to install.
6666
<2> The desired secondary console. In this case, the graphical console. Omitting this option will disable the graphical console.
6767
<3> The desired primary console. In this case, the serial console. The `options` field defines the baud rate and other settings. A common value for this field is `115200n8`. If no options are provided, the default kernel value of `9600n8` is used. For more information on the format of this option, see the link:https://www.kernel.org/doc/html/latest/admin-guide/serial-console.html[Linux kernel serial console] documentation.
68-
<4> The specified disk to install to. In this case, `/dev/sda`. If you omit this option, the {boot-media} automatically runs the installer which will fail unless you also specify the `coreos.inst.install_dev` kernel argument.
68+
<4> The specified disk to install to. If you omit this option, the {boot-media} automatically runs the installer which will fail unless you also specify the `coreos.inst.install_dev` kernel argument.
6969
+
7070
Your customizations are applied and affect every subsequent boot of the {boot-media}.
7171
endif::[]

modules/installation-user-infra-machines-advanced-customizing-live.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ifeval::["{boot-media}" == "ISO image"]
2828
----
2929
$ coreos-installer iso customize rhcos-<version>-live.x86_64.iso \
3030
--dest-ignition bootstrap.ign \ <1>
31-
--dest-device /dev/sda <2>
31+
--dest-device /dev/disk/by-id/scsi-<serial_number> <2>
3232
----
3333
endif::[]
3434

@@ -39,7 +39,7 @@ ifeval::["{boot-media}" == "PXE environment"]
3939
----
4040
$ coreos-installer pxe customize rhcos-<version>-live-initramfs.x86_64.img \
4141
--dest-ignition bootstrap.ign \ <1>
42-
--dest-device /dev/sda \ <2>
42+
--dest-device /dev/disk/by-id/scsi-<serial_number> \ <2>
4343
-o rhcos-<version>-custom-initramfs.x86_64.img
4444
----
4545
endif::[]

modules/installation-user-infra-machines-advanced-enabling-serial-console.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ By default, the {op-system-first} serial console is disabled and all output is w
2121
$ coreos-installer install \
2222
--console=tty0 \//<1>
2323
--console=ttyS0,<options> \//<2>
24-
--ignition-url=http://host/worker.ign /dev/sda
24+
--ignition-url=http://host/worker.ign /dev/disk/by-id/scsi-<serial_number>
2525
----
2626
+
2727
<1> The desired secondary console. In this case, the graphical console. Omitting this option will disable the graphical console.

0 commit comments

Comments
 (0)