diff options
Diffstat (limited to 'nova/manager.py')
| -rw-r--r-- | nova/manager.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/manager.py b/nova/manager.py index 8beae2732..59da6155a 100644 --- a/nova/manager.py +++ b/nova/manager.py @@ -57,13 +57,14 @@ import eventlet from nova import config from nova.db import base +from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova.openstack.common.plugin import pluginmanager from nova.openstack.common.rpc import dispatcher as rpc_dispatcher from nova.scheduler import rpcapi as scheduler_rpcapi from nova import version -CONF = config.CONF +CONF = cfg.CONF LOG = logging.getLogger(__name__) |