diff options
| author | Todd Willey <todd@rubidine.com> | 2010-07-14 23:46:23 -0400 |
|---|---|---|
| committer | Todd Willey <todd@rubidine.com> | 2010-07-14 23:46:23 -0400 |
| commit | 69bb10a9f3258be06e34dbb2b051ed2bdd31c1d7 (patch) | |
| tree | dd9339d9f1ea371b5e5722112120c9f4cf729f21 /bin/nova-api | |
| parent | 702391e5d3f3cee5fe1d5e34d175f0fe0b5d0d7a (diff) | |
| parent | 1624e2aa51d6a77fbcbbf75f756aa88d27d1c474 (diff) | |
Merge branch 'master' into vpnredis
Conflicts:
nova/auth/users.py
Diffstat (limited to 'bin/nova-api')
| -rwxr-xr-x | bin/nova-api | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/bin/nova-api b/bin/nova-api index f0f79a236..1bef778c5 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 @@ -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, |