summaryrefslogtreecommitdiffstats
path: root/bin/nova-api
diff options
context:
space:
mode:
Diffstat (limited to 'bin/nova-api')
-rwxr-xr-xbin/nova-api8
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,