github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 02:34:03 +00:00
Code Issues Projects Releases Wiki Activity

Fix Cinder volume detection on OpenStack Train

Browse Source 
Newer OpenStack does not truncate volumeID to 20 characters.
/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_033fa19a-a5e3-445a-8631-3e9349e540e5
was seen on an OpenStack Train node.
This commit is contained in:
Jan Safranek 2020-11-18 10:51:13 +01:00
parent b3fc888863
commit 92c3895115
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/legacy-cloud-providers/openstack/openstack_volumes.go
View File

@ -491,11 +491,14 @@ func (os *OpenStack) CreateVolume(name string, size int, vtype, availability str
func (os *OpenStack) GetDevicePathBySerialID(volumeID string) string { func (os *OpenStack) GetDevicePathBySerialID(volumeID string) string {
// Build a list of candidate device paths. // Build a list of candidate device paths.
// Certain Nova drivers will set the disk serial ID, including the Cinder volume id. // Certain Nova drivers will set the disk serial ID, including the Cinder volume id.
// Newer OpenStacks may not truncate the volumeID to 20 chars.
candidateDeviceNodes := []string{ candidateDeviceNodes := []string{
// KVM // KVM
fmt.Sprintf("virtio-%s", volumeID[:20]), fmt.Sprintf("virtio-%s", volumeID[:20]),
fmt.Sprintf("virtio-%s", volumeID),
// KVM virtio-scsi // KVM virtio-scsi
fmt.Sprintf("scsi-0QEMU_QEMU_HARDDISK_%s", volumeID[:20]), fmt.Sprintf("scsi-0QEMU_QEMU_HARDDISK_%s", volumeID[:20]),
fmt.Sprintf("scsi-0QEMU_QEMU_HARDDISK_%s", volumeID),
// ESXi // ESXi
fmt.Sprintf("wwn-0x%s", strings.Replace(volumeID, "-", "", -1)), fmt.Sprintf("wwn-0x%s", strings.Replace(volumeID, "-", "", -1)),
} }