Set default core_plugin to None
Fixes bug 1093989 Change-Id: Ib0b77994b813e6b2ec0621949371c66d66472896
This commit is contained in:
parent
8061a78a96
commit
b5ea60252f
@ -38,7 +38,7 @@ bind_port = 9696
|
||||
# api_extensions_path =
|
||||
|
||||
# Quantum plugin provider module
|
||||
core_plugin = quantum.plugins.sample.SamplePlugin.FakePlugin
|
||||
# core_plugin =
|
||||
|
||||
# Advanced service modules
|
||||
# service_plugins =
|
||||
|
@ -40,8 +40,7 @@ core_opts = [
|
||||
cfg.StrOpt('api_extensions_path', default=""),
|
||||
cfg.StrOpt('policy_file', default="policy.json"),
|
||||
cfg.StrOpt('auth_strategy', default='keystone'),
|
||||
cfg.StrOpt('core_plugin',
|
||||
default='quantum.plugins.sample.SamplePlugin.FakePlugin'),
|
||||
cfg.StrOpt('core_plugin'),
|
||||
cfg.ListOpt('service_plugins',
|
||||
default=[]),
|
||||
cfg.StrOpt('base_mac', default="fa:16:3e:00:00:00"),
|
||||
|
@ -284,7 +284,7 @@ def run_tests(c=None):
|
||||
# and override the values in it if needed (e.g., run_tests.py in
|
||||
# quantum/plugins/openvswitch/ )
|
||||
test_config = {
|
||||
"plugin_name": "quantum.plugins.sample.SamplePlugin.FakePlugin",
|
||||
"plugin_name": "",
|
||||
"default_net_op_status": constants.NET_STATUS_ACTIVE,
|
||||
"default_port_op_status": constants.PORT_STATUS_ACTIVE,
|
||||
}
|
||||
|
@ -71,6 +71,11 @@ class QuantumManager(object):
|
||||
if not options:
|
||||
options = {}
|
||||
|
||||
if cfg.CONF.core_plugin is None:
|
||||
msg = _('Quantum core_plugin not configured!')
|
||||
LOG.critical(msg)
|
||||
raise Exception(msg)
|
||||
|
||||
# NOTE(jkoelker) Testing for the subclass with the __subclasshook__
|
||||
# breaks tach monitoring. It has been removed
|
||||
# intentianally to allow v2 plugins to be monitored
|
||||
|
Loading…
Reference in New Issue
Block a user