components/openstack/ironic/patches/03-boot-device.patch
changeset 6855 ea44e7e0ca98
parent 6854 52081f923019
child 6856 356aeea98c39
--- a/components/openstack/ironic/patches/03-boot-device.patch	Wed Sep 07 14:48:42 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-Ironic is very "Linux" centric, so for all nodes regardless of architecture it
-reports the same list of supported boot devices.
-
-This is not correct for SPARC, e.g. PXE is not supported.
-
-This patch simply passes the task into the driver implemented method for 
-getting the boot device so that architecture specific information can be
-returned.
-
-Upstream bug logged against trunk:
-  https://bugs.launchpad.net/ironic/+bug/1391598
-
---- ORIGINAL/ironic/conductor/manager.py	2015-05-05 22:41:35.764613395 +0100
-+++ ironic-2015.1.0/ironic/conductor/manager.py	2015-05-05 22:47:23.046291559 +0100
-@@ -1615,7 +1615,7 @@
-             if not getattr(task.driver, 'management', None):
-                 raise exception.UnsupportedDriverExtension(
-                             driver=task.node.driver, extension='management')
--            return task.driver.management.get_supported_boot_devices()
-+            return task.driver.management.get_supported_boot_devices(task)
- 
-     @messaging.expected_exceptions(exception.NoFreeConductorWorker,
-                                    exception.NodeLocked,
---- ORIGINAL/ironic/drivers/base.py	2015-05-05 22:41:35.780975517 +0100
-+++ ironic-2015.1.0/ironic/drivers/base.py	2015-05-05 22:48:01.342155003 +0100
-@@ -629,9 +629,10 @@
-         """
- 
-     @abc.abstractmethod
--    def get_supported_boot_devices(self):
-+    def get_supported_boot_devices(self, task=None):
-         """Get a list of the supported boot devices.
- 
-+        :param task: a task from TaskManager.
-         :returns: A list with the supported boot devices defined
-                   in :mod:`ironic.common.boot_devices`.
-         """