summaryrefslogtreecommitdiffstats
path: root/bin/nova-api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-02-20 08:50:18 +0000
committerGerrit Code Review <review@openstack.org>2013-02-20 08:50:18 +0000
commite37e02870216ea6de130ce3d1b2e8f642de9faf6 (patch)
treed3eef37cf671a7879303d3f693e8621c75377fe3 /bin/nova-api
parent512490200e009bce3cb155fcea683e9776d67658 (diff)
parent706a1370056ffccc2c8811fc1ac0679944564ece (diff)
Merge "Use oslo-config-2013.1b4"
Diffstat (limited to 'bin/nova-api')
-rwxr-xr-xbin/nova-api2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/nova-api b/bin/nova-api
index d957f3e58..d21d955cf 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -29,6 +29,7 @@ eventlet.monkey_patch(os=False)
import os
import sys
+from oslo.config import cfg
possible_topdir = os.path.normpath(os.path.join(os.path.abspath(
sys.argv[0]), os.pardir, os.pardir))
@@ -37,7 +38,6 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")):
from nova import config
-from nova.openstack.common import cfg
from nova.openstack.common import log as logging
from nova import service
from nova import utils