Merge "Prevent un-needed iscsi cleanup" into stable/stein
This commit is contained in:
commit
1640c7b826
|
@ -195,6 +195,7 @@ class IronicPythonAgent(base.ExecuteCommandMixin):
|
||||||
self.hardware_initialization_delay = hardware_initialization_delay
|
self.hardware_initialization_delay = hardware_initialization_delay
|
||||||
# IPA will stop serving requests and exit after this is set to False
|
# IPA will stop serving requests and exit after this is set to False
|
||||||
self.serve_api = True
|
self.serve_api = True
|
||||||
|
self.iscsi_started = False
|
||||||
|
|
||||||
def get_status(self):
|
def get_status(self):
|
||||||
"""Retrieve a serializable status.
|
"""Retrieve a serializable status.
|
||||||
|
|
|
@ -384,7 +384,8 @@ class ImageExtension(base.BaseAgentExtension):
|
||||||
|
|
||||||
"""
|
"""
|
||||||
device = hardware.dispatch_to_managers('get_os_install_device')
|
device = hardware.dispatch_to_managers('get_os_install_device')
|
||||||
iscsi.clean_up(device)
|
if self.agent.iscsi_started:
|
||||||
|
iscsi.clean_up(device)
|
||||||
boot = hardware.dispatch_to_managers('get_boot_info')
|
boot = hardware.dispatch_to_managers('get_boot_info')
|
||||||
if boot.current_boot_mode == 'uefi':
|
if boot.current_boot_mode == 'uefi':
|
||||||
has_efibootmgr = True
|
has_efibootmgr = True
|
||||||
|
|
|
@ -189,7 +189,8 @@ class ISCSIExtension(base.BaseAgentExtension):
|
||||||
else:
|
else:
|
||||||
_start_lio(iqn, portal_port, device)
|
_start_lio(iqn, portal_port, device)
|
||||||
LOG.debug('Linux-IO configuration: %s', rts_root.dump())
|
LOG.debug('Linux-IO configuration: %s', rts_root.dump())
|
||||||
|
# Mark iscsi as previously started
|
||||||
|
self.agent.iscsi_started = True
|
||||||
LOG.info('Created iSCSI target with iqn %(iqn)s, portal port %(port)d,'
|
LOG.info('Created iSCSI target with iqn %(iqn)s, portal port %(port)d,'
|
||||||
' on device %(dev)s using %(method)s',
|
' on device %(dev)s using %(method)s',
|
||||||
{'iqn': iqn, 'port': portal_port, 'dev': device,
|
{'iqn': iqn, 'port': portal_port, 'dev': device,
|
||||||
|
|
|
@ -45,6 +45,8 @@ class TestImageExtension(base.IronicAgentTest):
|
||||||
self.fake_efi_system_part_uuid = '45AB-2312'
|
self.fake_efi_system_part_uuid = '45AB-2312'
|
||||||
self.fake_prep_boot_part_uuid = '76937797-3253-8843-999999999999'
|
self.fake_prep_boot_part_uuid = '76937797-3253-8843-999999999999'
|
||||||
self.fake_dir = '/tmp/fake-dir'
|
self.fake_dir = '/tmp/fake-dir'
|
||||||
|
self.agent_extension.agent = mock.Mock()
|
||||||
|
self.agent_extension.agent.iscsi_started = True
|
||||||
|
|
||||||
@mock.patch.object(iscsi, 'clean_up', autospec=True)
|
@mock.patch.object(iscsi, 'clean_up', autospec=True)
|
||||||
@mock.patch.object(image, '_install_grub2', autospec=True)
|
@mock.patch.object(image, '_install_grub2', autospec=True)
|
||||||
|
|
|
@ -25,6 +25,9 @@ from ironic_python_agent import utils
|
||||||
|
|
||||||
|
|
||||||
class FakeAgent(object):
|
class FakeAgent(object):
|
||||||
|
|
||||||
|
iscsi_started = False
|
||||||
|
|
||||||
def get_node_uuid(self):
|
def get_node_uuid(self):
|
||||||
return 'my_node_uuid'
|
return 'my_node_uuid'
|
||||||
|
|
||||||
|
@ -47,8 +50,11 @@ class TestISCSIExtensionTgt(base.IronicAgentTest):
|
||||||
mock_destroy):
|
mock_destroy):
|
||||||
mock_dispatch.return_value = self.fake_dev
|
mock_dispatch.return_value = self.fake_dev
|
||||||
mock_execute.return_value = ('', '')
|
mock_execute.return_value = ('', '')
|
||||||
|
self.assertFalse(self.agent_extension.agent.iscsi_started)
|
||||||
|
|
||||||
result = self.agent_extension.start_iscsi_target(iqn=self.fake_iqn)
|
result = self.agent_extension.start_iscsi_target(iqn=self.fake_iqn)
|
||||||
|
|
||||||
|
self.assertTrue(self.agent_extension.agent.iscsi_started)
|
||||||
expected = [mock.call('tgtd'),
|
expected = [mock.call('tgtd'),
|
||||||
mock.call('tgtadm', '--lld', 'iscsi', '--mode',
|
mock.call('tgtadm', '--lld', 'iscsi', '--mode',
|
||||||
'target', '--op', 'show', attempts=10),
|
'target', '--op', 'show', attempts=10),
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
Fixes an issue with the ironic-python-agent where we would call to
|
||||||
|
setup the bootloader, which is necessary with software raid, but also
|
||||||
|
attempt to clean up iSCSI. This can cause issues when using the ``direct``
|
||||||
|
``deploy_interface``. Now the agent will only clean up iSCSI connections
|
||||||
|
if iSCSI was explicitly started. For more information, please see
|
||||||
|
`story 2007937 <https://storyboard.openstack.org/#!/story/2007937>`_.
|
Loading…
Reference in New Issue