summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorTodd Willey <todd@rubidine.com>2010-07-14 19:51:38 -0400
committerTodd Willey <todd@rubidine.com>2010-07-14 19:51:38 -0400
commitced951677c72307f173d37ef6d119d3202ace355 (patch)
tree6505146ccfa591dabbcda1236a9a15334f7d7d3b /bin
parent09f69254b5af4b9ee40f9848e47f1b2187599cb5 (diff)
Finish singletonizing UserManager usage.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/nova-api6
1 files changed, 2 insertions, 4 deletions
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,