diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-06-28 22:47:02 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-06-28 22:47:02 -0700 |
| commit | a013a801246bed9302303c304b90c748e2d7aec0 (patch) | |
| tree | 36ae3566eb9fa4b5edd2728318fa0f6d4a4acaf2 /bin/nova-api | |
| parent | c363f3239168081d5b87f9ef4690a6123784a024 (diff) | |
| parent | c7f7e1bc4185be38ff792bfd82a74e35ecbeda12 (diff) | |
Merge remote branch 'angst/apply_api' into diekeeper
Diffstat (limited to 'bin/nova-api')
| -rwxr-xr-x | bin/nova-api | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/nova-api b/bin/nova-api index e9772ec81..f0f79a236 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 @@ -34,6 +34,7 @@ from nova import rpc from nova import server from nova import utils from nova.auth import users +from nova.compute import model from nova.endpoint import admin from nova.endpoint import api from nova.endpoint import cloud @@ -43,9 +44,10 @@ FLAGS = flags.FLAGS def main(_argv): user_manager = users.UserManager() + host_manager = model.Host controllers = { 'Cloud': cloud.CloudController(), - 'Admin': admin.AdminController(user_manager) + 'Admin': admin.AdminController(user_manager, host_manager) } _app = api.APIServerApplication(user_manager, controllers) |