Merge "Deprecate implicit loading of service_providers from neutron_*.conf"

This commit is contained in:
Jenkins 2016-08-18 10:51:19 +00:00 committed by Gerrit Code Review
commit ab1b3f9bed
2 changed files with 13 additions and 0 deletions

View File

@ -22,6 +22,7 @@ from neutron.conf.services import provider_configuration as prov_config
from neutron_lib import exceptions as n_exc
from oslo_config import cfg
from oslo_log import log as logging
from oslo_log import versionutils
import stevedore
from neutron._i18n import _, _LW
@ -116,6 +117,11 @@ class NeutronModule(object):
# necessary, if modules are loaded on the fly (DevStack may
# be an example)
if not providers:
versionutils.report_deprecated_feature(
LOG,
_LW('Implicit loading of service providers from '
'neutron_*.conf files is deprecated and will be removed '
'in Ocata release.'))
providers = self.ini().service_providers.service_provider
return providers

View File

@ -0,0 +1,7 @@
---
deprecations:
- Neutron controller service currently allows to load ``service_providers``
options from some files that are not passed to it via --config-dir or
--config-dir CLI options. This behaviour is now deprecated and will be
disabled in Ocata. Current users are advised to switch to aforementioned
CLI options.