summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-04-08 21:01:38 +0000
committerGerrit Code Review <review@openstack.org>2013-04-08 21:01:38 +0000
commit88cd09445ea46bba0f62ef58894fd92243021a88 (patch)
treee2d4ff9857dc2ce3b8fe8fcfaa95fcd509210645 /nova
parent8f2d50381d2796a5b4b5f5df21c65dacd764a264 (diff)
parent6a299b59bab935d95d20e51642290680df9560fe (diff)
downloadnova-88cd09445ea46bba0f62ef58894fd92243021a88.tar.gz
nova-88cd09445ea46bba0f62ef58894fd92243021a88.tar.xz
nova-88cd09445ea46bba0f62ef58894fd92243021a88.zip
Merge "nova-consoleauth start failed by consoleauth_manager option missing "
Diffstat (limited to 'nova')
-rw-r--r--nova/cmd/consoleauth.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/cmd/consoleauth.py b/nova/cmd/consoleauth.py
index d21b9b3f5..ea28a2faf 100644
--- a/nova/cmd/consoleauth.py
+++ b/nova/cmd/consoleauth.py
@@ -27,6 +27,7 @@ from nova.openstack.common import log as logging
from nova import service
CONF = cfg.CONF
+CONF.import_opt('consoleauth_manager', 'nova.consoleauth.manager')
def main():