diff options
author | Dmitry Tantsur <dtantsur@protonmail.com> | 2021-12-07 16:50:19 +0100 |
---|---|---|
committer | Dmitry Tantsur <dtantsur@protonmail.com> | 2021-12-20 15:11:17 +0100 |
commit | cfcea55cf6d05cbc90af83d91cfd1ee9719f07fd (patch) | |
tree | c9d5523c717cec7eeba3038f18ee5ddce4d6b176 /ironic/conductor/base_manager.py | |
parent | 19cafb55e134cf95477e9a7eff1542a6fae7dc6d (diff) | |
download | ironic-cfcea55cf6d05cbc90af83d91cfd1ee9719f07fd.tar.gz |
Automatically configure enabled_***_interfaces
This change makes it easier to configure power and management interfaces
(and thus vendor drivers) by figuring out reasonable defaults.
Story: #2009316
Task: #43717
Change-Id: I8779603e566be5a84daf6f680c0bbe2f191923d9
Diffstat (limited to 'ironic/conductor/base_manager.py')
-rw-r--r-- | ironic/conductor/base_manager.py | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/ironic/conductor/base_manager.py b/ironic/conductor/base_manager.py index d53e6af1e..aa684408f 100644 --- a/ironic/conductor/base_manager.py +++ b/ironic/conductor/base_manager.py @@ -40,7 +40,6 @@ from ironic.conductor import task_manager from ironic.conductor import utils from ironic.conf import CONF from ironic.db import api as dbapi -from ironic.drivers import base as driver_base from ironic.drivers.modules import deploy_utils from ironic import objects from ironic.objects import fields as obj_fields @@ -49,27 +48,6 @@ from ironic.objects import fields as obj_fields LOG = log.getLogger(__name__) -def _check_enabled_interfaces(): - """Sanity-check enabled_*_interfaces configs. - - We do this before we even bother to try to load up drivers. If we have any - dynamic drivers enabled, then we need interfaces enabled as well. - - :raises: ConfigInvalid if an enabled interfaces config option is empty. - """ - empty_confs = [] - iface_types = ['enabled_%s_interfaces' % i - for i in driver_base.ALL_INTERFACES] - for iface_type in iface_types: - conf_value = getattr(CONF, iface_type) - if not conf_value: - empty_confs.append(iface_type) - if empty_confs: - msg = (_('Configuration options %s cannot be an empty list.') % - ', '.join(empty_confs)) - raise exception.ConfigInvalid(error_msg=msg) - - class BaseConductorManager(object): def __init__(self, host, topic): @@ -146,8 +124,6 @@ class BaseConductorManager(object): use_groups=self._use_groups()) """Consistent hash ring which maps drivers to conductors.""" - _check_enabled_interfaces() - # NOTE(tenbrae): these calls may raise DriverLoadError or # DriverNotFound # NOTE(vdrok): Instantiate network and storage interface factory on |