diff options
Diffstat (limited to 'nova/tests/test_db_api.py')
| -rw-r--r-- | nova/tests/test_db_api.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py index 193378557d..8308315d2e 100644 --- a/nova/tests/test_db_api.py +++ b/nova/tests/test_db_api.py @@ -22,16 +22,16 @@ import datetime import uuid as stdlib_uuid -from nova import config from nova import context from nova import db from nova import exception +from nova.openstack.common import cfg from nova.openstack.common import timeutils from nova import test from nova.tests import matchers -CONF = config.CONF +CONF = cfg.CONF CONF.import_opt('reserved_host_memory_mb', 'nova.compute.resource_tracker') CONF.import_opt('reserved_host_disk_mb', 'nova.compute.resource_tracker') |