From 5749b8deb0f8f40fb10b41a397da82aae7e1a305 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Sun, 4 Nov 2012 21:32:38 +0000 Subject: 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 --- bin/nova-api | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'bin/nova-api') diff --git a/bin/nova-api b/bin/nova-api index 4bcfa7f79..776152e43 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -42,12 +42,14 @@ from nova.openstack.common import log as logging from nova import service from nova import utils +CONF = config.CONF + if __name__ == '__main__': config.parse_args(sys.argv) logging.setup("nova") utils.monkey_patch() launcher = service.ProcessLauncher() - for api in flags.FLAGS.enabled_apis: + for api in CONF.enabled_apis: server = service.WSGIService(api) launcher.launch_server(server, workers=server.workers or 1) launcher.wait() -- cgit