github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #96673 from jsafrane/fix-cinder-16

Browse Source 
Fix Cinder volume detection on OpenStack Train
This commit is contained in:
Kubernetes Prow Robot 2020-12-08 18:35:31 -08:00 committed by GitHub
commit 31fd5671ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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)),
} }