← Back to branch summary

~soren/nova/lp658257

« back to all changes in this revision

Viewing changes to nova/api/__init__.py

  • Committer: Tarmac
  • Author(s): mdietz
  • Date: 2010-10-08 21:18:37 UTC
  • mfrom: (332.2.4 rs_api_rename)
  • Revision ID: hudson@openstack.org-20101008211837-j9khriwzr28bdd2k
Renames every instance of "rackspace" in the API and test code base. Also includes a minor patch for the API Servers controller to use images correctly in the absence of Glance. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/__init__.py
27
27
from nova import wsgi
28
28
from nova.api import cloudpipe
29
29
from nova.api import ec2
30
 
from nova.api import rackspace
 
30
from nova.api import openstack
31
31
from nova.api.ec2 import metadatarequesthandler
32
32
 
33
33
 
57
57
        mapper.sub_domains = True
58
58
        mapper.connect("/", controller=self.rsapi_versions, 
59
59
                            conditions=rsdomain)
60
 
        mapper.connect("/v1.0/{path_info:.*}", controller=rackspace.API(),
 
60
        mapper.connect("/v1.0/{path_info:.*}", controller=openstack.API(),
61
61
                            conditions=rsdomain)
62
62
 
63
63
        mapper.connect("/", controller=self.ec2api_versions,