summaryrefslogtreecommitdiffstats
path: root/bin/nova-consoleauth
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2012-11-04 21:32:38 +0000
committerMark McLoughlin <markmc@redhat.com>2012-11-04 21:39:49 +0000
commit5749b8deb0f8f40fb10b41a397da82aae7e1a305 (patch)
tree84c67e0c8b59a8e4882077216b7f804eeccfea04 /bin/nova-consoleauth
parent8ce58defbe560b1da34d991b38ac64a9b4c8d654 (diff)
Switch from FLAGS to CONF in bin
Use the global CONF variable instead of FLAGS. This is purely a cleanup since FLAGS is already just another reference to CONF. We leave the nova.flags imports until a later cleanup commit since removing them may cause unpredictable problems due to config options not being registered. Change-Id: Id0c59b2dc8002ec89ccbc5e5d7986fb68d3a693d
Diffstat (limited to 'bin/nova-consoleauth')
-rwxr-xr-xbin/nova-consoleauth4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/nova-consoleauth b/bin/nova-consoleauth
index 14ef701a7..654a3f824 100755
--- a/bin/nova-consoleauth
+++ b/bin/nova-consoleauth
@@ -37,12 +37,12 @@ from nova import flags
from nova.openstack.common import log as logging
from nova import service
+CONF = config.CONF
if __name__ == "__main__":
config.parse_args(sys.argv)
- FLAGS = flags.FLAGS
logging.setup("nova")
server = service.Service.create(binary='nova-consoleauth',
- topic=FLAGS.consoleauth_topic)
+ topic=CONF.consoleauth_topic)
service.serve(server)
service.wait()