summaryrefslogtreecommitdiffstats
path: root/bin/nova-api
diff options
context:
space:
mode:
authorEric Day <eday@oddments.org>2010-08-07 19:51:17 -0700
committerEric Day <eday@oddments.org>2010-08-07 19:51:17 -0700
commit46c0f66d123e2b4af101bb12408ad6de5eb6855b (patch)
tree2f13afc4ce92a8f90e125616cc70088cf77100b7 /bin/nova-api
parentff47d384a4be8627a32ee8e34dddc5bd005ac063 (diff)
Cleaned up pep8/pylint for bin/* files. I did not fix rsapi since this is already cleaned up in another branch.
Diffstat (limited to 'bin/nova-api')
-rwxr-xr-xbin/nova-api6
1 files changed, 2 insertions, 4 deletions
diff --git a/bin/nova-api b/bin/nova-api
index 1f2009c30..13baf22a7 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -29,8 +29,6 @@ from nova import flags
from nova import rpc
from nova import server
from nova import utils
-from nova.auth import manager
-from nova.compute import model
from nova.endpoint import admin
from nova.endpoint import api
from nova.endpoint import cloud
@@ -39,10 +37,10 @@ FLAGS = flags.FLAGS
def main(_argv):
+ """Load the controllers and start the tornado I/O loop."""
controllers = {
'Cloud': cloud.CloudController(),
- 'Admin': admin.AdminController()
- }
+ 'Admin': admin.AdminController()}
_app = api.APIServerApplication(controllers)
conn = rpc.Connection.instance()