Merge "Switch to oslo.cache lib"
This commit is contained in:
commit
c8d68e200c
@ -32,6 +32,7 @@ import mock
|
||||
import os
|
||||
|
||||
import fixtures
|
||||
from oslo_cache import core as cache
|
||||
from oslo_concurrency import lockutils
|
||||
from oslo_config import cfg
|
||||
from oslo_config import fixture as config_fixture
|
||||
@ -60,6 +61,7 @@ CONF.import_opt('enabled', 'nova.api.openstack', group='osapi_v21')
|
||||
logging.register_options(CONF)
|
||||
CONF.set_override('use_stderr', False)
|
||||
logging.setup(CONF, 'nova')
|
||||
cache.configure(CONF)
|
||||
|
||||
_TRUE_VALUES = ('True', 'true', '1', 'yes')
|
||||
|
||||
|
@ -34,6 +34,7 @@ six>=1.9.0 # MIT
|
||||
stevedore>=1.5.0 # Apache-2.0
|
||||
setuptools>=16.0 # PSF/ZPL
|
||||
websockify>=0.6.1 # LGPLv3
|
||||
oslo.cache>=0.8.0 # Apache-2.0
|
||||
oslo.concurrency>=2.3.0 # Apache-2.0
|
||||
oslo.config>=3.4.0 # Apache-2.0
|
||||
oslo.context>=0.2.0 # Apache-2.0
|
||||
|
@ -34,7 +34,7 @@ oslo.config.opts =
|
||||
nova.network = nova.network.opts:list_opts
|
||||
nova.network.neutronv2 = nova.network.neutronv2.api:list_opts
|
||||
nova.virt = nova.virt.opts:list_opts
|
||||
nova.openstack.common.memorycache = nova.openstack.common.memorycache:list_opts
|
||||
nova.cache_utils = nova.cache_utils:list_opts
|
||||
|
||||
nova.compute.monitors.cpu =
|
||||
virt_driver = nova.compute.monitors.cpu.virt_driver:Monitor
|
||||
|
Loading…
x
Reference in New Issue
Block a user