Merge "Stop trying to power off nodes if manage_boot is False"
This commit is contained in:
commit
2e14f0e9b4
|
@ -286,7 +286,7 @@ def _process_node(node_info, node, introspection_data):
|
|||
resp = {'uuid': node.uuid}
|
||||
|
||||
# determine how to handle power
|
||||
if keep_power_on:
|
||||
if keep_power_on or not node_info.manage_boot:
|
||||
power_action = False
|
||||
else:
|
||||
power_action = CONF.processing.power_off
|
||||
|
|
|
@ -551,6 +551,15 @@ class TestProcessNode(BaseTest):
|
|||
finished_mock.assert_called_once_with(
|
||||
self.node_info, istate.Events.finish)
|
||||
|
||||
@mock.patch.object(node_cache.NodeInfo, 'finished', autospec=True)
|
||||
def test_no_manage_boot(self, finished_mock):
|
||||
self.node_info._manage_boot = False
|
||||
process._process_node(self.node_info, self.node, self.data)
|
||||
|
||||
self.assertFalse(self.cli.node.set_power_state.called)
|
||||
finished_mock.assert_called_once_with(
|
||||
self.node_info, istate.Events.finish)
|
||||
|
||||
@mock.patch.object(swift, 'SwiftAPI', autospec=True)
|
||||
def test_store_data_with_swift(self, swift_mock):
|
||||
CONF.set_override('store_data', 'swift', 'processing')
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
fixes:
|
||||
- |
|
||||
No longer tries to power off nodes after introspection if ``manage_boot``
|
||||
is ``False``.
|
Loading…
Reference in New Issue