Merge "Only emit deprecation warning when deprecated value read"

This commit is contained in:
Jenkins 2016-10-18 00:54:13 +00:00 committed by Gerrit Code Review
commit d2a28a8c73
1 changed files with 7 additions and 5 deletions

View File

@ -114,13 +114,15 @@ 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
if 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.'))
return providers