Merge "Ensures common services plugin is always loaded"

This commit is contained in:
Jenkins 2016-09-15 08:10:21 +00:00 committed by Gerrit Code Review
commit bc2aac2d45
2 changed files with 3 additions and 1 deletions

View File

@ -40,7 +40,7 @@ core_opts = [
help=_("The API paste config file to use")),
cfg.StrOpt('api_extensions_path', default="",
help=_("The path for API extensions")),
cfg.ListOpt('service_plugins', default=['nfvo', 'vnfm', 'commonservices'],
cfg.ListOpt('service_plugins', default=['nfvo', 'vnfm'],
help=_("The service plugins Tacker will use")),
cfg.StrOpt('policy_file', default="policy.json",
help=_("The policy file to use")),

View File

@ -129,6 +129,8 @@ class TackerManager(object):
advanced services then loads classes provided in configuration.
"""
plugin_providers = cfg.CONF.service_plugins
if 'commonservices' not in plugin_providers:
plugin_providers.append('commonservices')
LOG.debug(_("Loading service plugins: %s"), plugin_providers)
for provider in plugin_providers:
if provider == '':