summaryrefslogtreecommitdiffstats
path: root/bin/nova-api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-11-20 02:09:06 +0000
committerGerrit Code Review <review@openstack.org>2012-11-20 02:09:06 +0000
commit06e2d3ea3b77c9fcc67fa90c01895d6f9d6fd656 (patch)
tree4591e5792ff6e9e17d8aee0dbedd885e482d094c /bin/nova-api
parent8c821c872cbec95bd48e68dc62c46030a097ce4f (diff)
parente237c86446ba4ecba95cf65a2609733707aab68e (diff)
downloadnova-06e2d3ea3b77c9fcc67fa90c01895d6f9d6fd656.tar.gz
nova-06e2d3ea3b77c9fcc67fa90c01895d6f9d6fd656.tar.xz
nova-06e2d3ea3b77c9fcc67fa90c01895d6f9d6fd656.zip
Merge "Use CONF.import_opt() for nova.config opts"
Diffstat (limited to 'bin/nova-api')
-rwxr-xr-xbin/nova-api1
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/nova-api b/bin/nova-api
index 6d3304a95..ceb7ca496 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -43,6 +43,7 @@ from nova import service
from nova import utils
CONF = cfg.CONF
+CONF.import_opt('enabled_apis', 'nova.config')
if __name__ == '__main__':
config.parse_args(sys.argv)