8 returned. |
8 returned. |
9 |
9 |
10 Upstream bug logged against trunk: |
10 Upstream bug logged against trunk: |
11 https://bugs.launchpad.net/ironic/+bug/1391598 |
11 https://bugs.launchpad.net/ironic/+bug/1391598 |
12 |
12 |
13 --- ORIGINAL/ironic/conductor/manager.py 2015-02-20 18:03:18.051557776 +0000 |
13 --- ORIGINAL/ironic/conductor/manager.py 2015-05-05 22:41:35.764613395 +0100 |
14 +++ ironic-2014.2.1/ironic/conductor/manager.py 2015-02-20 18:08:33.001316709 +0000 |
14 +++ ironic-2015.1.0/ironic/conductor/manager.py 2015-05-05 22:47:23.046291559 +0100 |
15 @@ -1380,4 +1380,4 @@ |
15 @@ -1615,7 +1615,7 @@ |
16 if not getattr(task.driver, 'management', None): |
16 if not getattr(task.driver, 'management', None): |
17 raise exception.UnsupportedDriverExtension( |
17 raise exception.UnsupportedDriverExtension( |
18 driver=task.node.driver, extension='management') |
18 driver=task.node.driver, extension='management') |
19 - return task.driver.management.get_supported_boot_devices() |
19 - return task.driver.management.get_supported_boot_devices() |
20 + return task.driver.management.get_supported_boot_devices(task) |
20 + return task.driver.management.get_supported_boot_devices(task) |
21 --- ORIGINAL/ironic/drivers/base.py 2015-02-20 18:03:18.037072121 +0000 |
21 |
22 +++ ironic-2014.2.1/ironic/drivers/base.py 2015-02-20 18:09:58.769898691 +0000 |
22 @messaging.expected_exceptions(exception.NoFreeConductorWorker, |
23 @@ -436,9 +436,10 @@ |
23 exception.NodeLocked, |
|
24 --- ORIGINAL/ironic/drivers/base.py 2015-05-05 22:41:35.780975517 +0100 |
|
25 +++ ironic-2015.1.0/ironic/drivers/base.py 2015-05-05 22:48:01.342155003 +0100 |
|
26 @@ -629,9 +629,10 @@ |
24 """ |
27 """ |
25 |
28 |
26 @abc.abstractmethod |
29 @abc.abstractmethod |
27 - def get_supported_boot_devices(self): |
30 - def get_supported_boot_devices(self): |
28 + def get_supported_boot_devices(self, task=None): |
31 + def get_supported_boot_devices(self, task=None): |