Remove deprecated option [DEFAULT]enabled_drivers

The option was deprecated in Rocky, this patch removes it.

Change-Id: I6c1ef41b0f960fc2843a494dfd002a982e2bef01
This commit is contained in:
Kaifeng Wang 2019-06-06 12:10:04 +08:00
parent 91e5a145f2
commit a3634840f4
3 changed files with 7 additions and 14 deletions

View File

@ -117,11 +117,6 @@ class BaseConductorManager(object):
use_groups=self._use_groups())
"""Consistent hash ring which maps drivers to conductors."""
# TODO(dtantsur): remove in Stein
if CONF.enabled_drivers:
raise RuntimeError("The enabled_drivers configuration option "
"no longer has any effect and must be empty")
_check_enabled_interfaces()
# NOTE(deva): these calls may raise DriverLoadError or DriverNotFound

View File

@ -77,15 +77,6 @@ api_opts = [
]
driver_opts = [
cfg.ListOpt('enabled_drivers',
default=[],
help=_('This option is left for a start up check only. '
'Any non-empty value will prevent the conductor '
'from starting.'),
deprecated_for_removal=True,
deprecated_reason=_('Hardware types should be used instead '
'of classic drivers. They are enabled '
'via the enabled_hardware_types option.')),
cfg.ListOpt('enabled_hardware_types',
default=['ipmi'],
help=_('Specify the list of hardware types to load during '

View File

@ -0,0 +1,7 @@
---
upgrade:
- |
The configuration option ``[DEFAULT]enabled_drivers`` is removed. The
option was deprecated in Rocky, and setting this option has raised an
exception preventing conductor from starting since then.
``[DEFAULT]enabled_hardware_types`` should be used instead.