summaryrefslogtreecommitdiff
path: root/nova/api/__init__.py
diff options
context:
space:
mode:
authormdietz <mdietz@openstack>2010-10-08 20:39:00 +0000
committermdietz <mdietz@openstack>2010-10-08 20:39:00 +0000
commit90f38090ecd586a39257b3efd2c86c2c60b7fdb9 (patch)
treebe9df6d0338f823b52a4d9103404df37172ca7b8 /nova/api/__init__.py
parent25fa39ad7dc17f9e6e694006aabb4ef6b3f933fc (diff)
downloadnova-90f38090ecd586a39257b3efd2c86c2c60b7fdb9.tar.gz
Mass renaming
Diffstat (limited to 'nova/api/__init__.py')
-rw-r--r--nova/api/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/__init__.py b/nova/api/__init__.py
index 744abd621a..627883018b 100644
--- a/nova/api/__init__.py
+++ b/nova/api/__init__.py
@@ -27,7 +27,7 @@ from nova import flags
from nova import wsgi
from nova.api import cloudpipe
from nova.api import ec2
-from nova.api import rackspace
+from nova.api import openstack
from nova.api.ec2 import metadatarequesthandler
@@ -57,7 +57,7 @@ class API(wsgi.Router):
mapper.sub_domains = True
mapper.connect("/", controller=self.rsapi_versions,
conditions=rsdomain)
- mapper.connect("/v1.0/{path_info:.*}", controller=rackspace.API(),
+ mapper.connect("/v1.0/{path_info:.*}", controller=openstack.API(),
conditions=rsdomain)
mapper.connect("/", controller=self.ec2api_versions,