From e2e924e023f58615080c7f1ab8d370269ad07f57 Mon Sep 17 00:00:00 2001
From: Mike Bryant <mike@mikebryant.me.uk>
Date: Wed, 15 Feb 2017 17:27:31 +0000
Subject: [PATCH] cinder: Add support for virtio-scsi

The VirtIO SCSI driver for KVM changes the way disks appear in /dev/disk/by-id.
This adds support for the new format.
---
 pkg/cloudprovider/providers/openstack/openstack_volumes.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/cloudprovider/providers/openstack/openstack_volumes.go b/pkg/cloudprovider/providers/openstack/openstack_volumes.go
index 1e9b9d2f63..41fbc17aa8 100644
--- a/pkg/cloudprovider/providers/openstack/openstack_volumes.go
+++ b/pkg/cloudprovider/providers/openstack/openstack_volumes.go
@@ -176,6 +176,8 @@ func (os *OpenStack) GetDevicePath(diskId string) string {
 	candidateDeviceNodes := []string{
 		// KVM
 		fmt.Sprintf("virtio-%s", diskId[:20]),
+		// KVM virtio-scsi
+		fmt.Sprintf("scsi-0QEMU_QEMU_HARDDISK_%s", diskId[:20]),
 		// ESXi
 		fmt.Sprintf("wwn-0x%s", strings.Replace(diskId, "-", "", -1)),
 	}