Remove deprecated alias "root_device_hint" for "raid_device" hook

Deprecated in 3.1.0 (mid-Mitaka). Probably also completely unused.

Change-Id: Id1ea1e63e212a94dce61bd03c4217611cca3cd2e
This commit is contained in:
Dmitry Tantsur 2016-06-03 16:57:29 +02:00
parent b2c2767147
commit 457c1277de
5 changed files with 7 additions and 16 deletions

View File

@ -204,7 +204,7 @@ Here are some plugins that can be additionally enabled:
``example``
example plugin logging it's input and output.
``raid_device`` (deprecated name ``root_device_hint``)
``raid_device``
gathers block devices from ramdisk and exposes root device in multiple
runs.
``extra_hardware``

View File

@ -102,10 +102,3 @@ class RaidDeviceDetection(base.ProcessingHook):
node_info.patch([{'op': 'add',
'path': '/extra/block_devices',
'value': {'serials': current_devices}}])
class RootDeviceHintHook(RaidDeviceDetection):
def __init__(self):
LOG.warning(_LW('Using the root_device_hint alias for the '
'raid_device plugin is deprecated'))
super(RaidDeviceDetection, self).__init__()

View File

@ -23,12 +23,9 @@ class TestRaidDeviceDetection(test_base.NodeTest):
hook = raid_device.RaidDeviceDetection()
def test_loadable_by_name(self):
names = ('raid_device', 'root_device_hint')
base.CONF.set_override('processing_hooks', ','.join(names),
'processing')
for name in names:
ext = base.processing_hooks_manager()[name]
self.assertIsInstance(ext.obj, raid_device.RaidDeviceDetection)
base.CONF.set_override('processing_hooks', 'raid_device', 'processing')
ext = base.processing_hooks_manager()['raid_device']
self.assertIsInstance(ext.obj, raid_device.RaidDeviceDetection)
def test_missing_local_gb(self):
introspection_data = {}

View File

@ -0,0 +1,3 @@
---
upgrade:
- Removed the deprecated "root_device_hint" alias for the "raid_device" hook.

View File

@ -32,8 +32,6 @@ ironic_inspector.hooks.processing =
extra_hardware = ironic_inspector.plugins.extra_hardware:ExtraHardwareHook
raid_device = ironic_inspector.plugins.raid_device:RaidDeviceDetection
capabilities = ironic_inspector.plugins.capabilities:CapabilitiesHook
# Deprecated name for raid_device, don't confuse with root_disk_selection
root_device_hint = ironic_inspector.plugins.raid_device:RootDeviceHintHook
ironic_inspector.hooks.node_not_found =
example = ironic_inspector.plugins.example:example_not_found_hook
enroll = ironic_inspector.plugins.discovery:enroll_node_not_found_hook