From 09f69254b5af4b9ee40f9848e47f1b2187599cb5 Mon Sep 17 00:00:00 2001 From: Todd Willey Date: Wed, 14 Jul 2010 19:38:41 -0400 Subject: Whitespace fix. --- bin/nova-api | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin/nova-api') diff --git a/bin/nova-api b/bin/nova-api index f0f79a236..893eb201d 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -20,7 +20,7 @@ # under the License. """ -Tornado daemon for the main API endpoint. +Tornado daemon for the main API endpoint. """ import logging -- cgit From ced951677c72307f173d37ef6d119d3202ace355 Mon Sep 17 00:00:00 2001 From: Todd Willey Date: Wed, 14 Jul 2010 19:51:38 -0400 Subject: Finish singletonizing UserManager usage. --- bin/nova-api | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'bin/nova-api') diff --git a/bin/nova-api b/bin/nova-api index 893eb201d..1bef778c5 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -43,13 +43,11 @@ FLAGS = flags.FLAGS def main(_argv): - user_manager = users.UserManager() - host_manager = model.Host controllers = { 'Cloud': cloud.CloudController(), - 'Admin': admin.AdminController(user_manager, host_manager) + 'Admin': admin.AdminController() } - _app = api.APIServerApplication(user_manager, controllers) + _app = api.APIServerApplication(controllers) conn = rpc.Connection.instance() consumer = rpc.AdapterConsumer(connection=conn, -- cgit