summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorMichael Gundlach <michael.gundlach@rackspace.com>2010-08-17 13:23:20 -0400
committerMichael Gundlach <michael.gundlach@rackspace.com>2010-08-17 13:23:20 -0400
commite8be36d7a7be2ebbf5493766ce909d7913bf61e0 (patch)
treed922e9052fc40c80f166d82b04c8283c91df3324 /bin
parentf92851ba8ffcb530f6f3c4ea354dd89d29146f6c (diff)
Move eventlet-using class out of endpoint/__init__.py into its own submodule, so that twisted-related code using endpoint.[other stuff] wouldn't run eventlet and make unit tests throw crazy errors about eventlet 0.9.10 not playing nicely with twisted.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/nova-rsapi5
1 files changed, 2 insertions, 3 deletions
diff --git a/bin/nova-rsapi b/bin/nova-rsapi
index a35936eff..e2722422e 100755
--- a/bin/nova-rsapi
+++ b/bin/nova-rsapi
@@ -21,15 +21,14 @@
Daemon for the Rackspace API endpoint.
"""
-import nova.endpoint
-
from nova import flags
from nova import utils
from nova import wsgi
+from nova.endpoint import newapi
FLAGS = flags.FLAGS
flags.DEFINE_integer('cc_port', 8773, 'cloud controller port')
if __name__ == '__main__':
utils.default_flagfile()
- wsgi.run_server(nova.endpoint.APIVersionRouter(), FLAGS.cc_port)
+ wsgi.run_server(newapi.APIVersionRouter(), FLAGS.cc_port)