summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorMichael Gundlach <michael.gundlach@rackspace.com>2010-08-18 13:09:34 -0400
committerMichael Gundlach <michael.gundlach@rackspace.com>2010-08-18 13:09:34 -0400
commit2eb1287f8d8c88eada2a14bed06ed1613c9beed2 (patch)
tree7ac0838f96196126d7f59acc34ed9a2db99ef17e /bin
parent24a6fd40f657896fb20249392be6ed41c30ca679 (diff)
parent4e5e72da2e3242026d757c8d5143e16f9d00cb6a (diff)
Pull in ~eday/nova/api-port
Diffstat (limited to 'bin')
-rwxr-xr-xbin/nova-api-new (renamed from bin/nova-rsapi)8
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/nova-rsapi b/bin/nova-api-new
index e2722422e..fda42339c 100755
--- a/bin/nova-rsapi
+++ b/bin/nova-api-new
@@ -18,17 +18,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
"""
- Daemon for the Rackspace API endpoint.
+Nova API daemon.
"""
+from nova import api
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')
+flags.DEFINE_integer('api_port', 8773, 'API port')
if __name__ == '__main__':
utils.default_flagfile()
- wsgi.run_server(newapi.APIVersionRouter(), FLAGS.cc_port)
+ wsgi.run_server(api.API(), FLAGS.api_port)