--- a/components/openstack/nova/patches/06-Solaris-dev-name.patch	Mon May 16 14:46:20 2016 +0200
+++ b/components/openstack/nova/patches/06-Solaris-dev-name.patch	Fri May 20 17:42:29 2016 -0400
@@ -1,9 +1,9 @@
-The patch is to fix the issue of linuxy devices names on Solaris instance recorded
-in the bugs (19987962 and 19277019).
+The patch is to fix the issue of linuxy devices names on Solaris
+instance recorded in the bugs (19987962 and 19277019).
 
---- nova-2014.2.2/nova/compute/utils.py.~1~	2015-02-05 06:26:50.000000000 -0800
-+++ nova-2014.2.2/nova/compute/utils.py	2015-02-09 10:13:15.882810433 -0800
-@@ -148,6 +148,23 @@
+--- nova-2015.1.0/nova/compute/utils.py.~1~     2015-05-05 10:50:25.237281011 -0600
++++ nova-2015.1.0/nova/compute/utils.py 2015-05-05 11:02:47.913482292 -0600
+@@ -133,6 +133,23 @@ def get_next_device_name(instance, devic
      /dev/vdc is specified but the backend uses /dev/xvdc), the device
      name will be converted to the appropriate format.
      """
@@ -24,6 +24,6 @@
 +        diff = [i for i in range(len(used_nums) + 1) if i not in used_nums]
 +        return prefix + str(min(diff))
 +
+     is_xen = driver.compute_driver_matches('xenapi.XenAPIDriver')
+
      req_prefix = None
-     req_letter = None
-