← Back to branch summary

~soren/nova/iptables-security-groups

« back to all changes in this revision

Viewing changes to nova/api/__init__.py

  • Committer: Soren Hansen
  • Date: 2011-01-03 09:56:21 UTC
  • mfrom: (430.2.79 nova)
  • Revision ID: soren@linux2go.dk-20110103095621-qy398qk1uk8o7cy3
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/__init__.py
24
24
:ec2api_subdomain:  subdomain running the EC2 API (default: ec2)
25
25
 
26
26
"""
 
27
import logging
27
28
 
28
29
import routes
29
30
import webob.dec
30
31
 
31
32
from nova import flags
32
 
from nova import utils
33
33
from nova import wsgi
34
 
from nova.api import cloudpipe
35
34
from nova.api import ec2
36
35
from nova.api import openstack
37
36
from nova.api.ec2 import metadatarequesthandler
41
40
                    'subdomain running the OpenStack API')
42
41
flags.DEFINE_string('ec2api_subdomain', 'ec2',
43
42
                    'subdomain running the EC2 API')
 
43
 
44
44
FLAGS = flags.FLAGS
45
45
 
46
46
 
80
80
            mapper.connect('%s/{path_info:.*}' % s, controller=mrh,
81
81
                           conditions=ec2api_subdomain)
82
82
 
83
 
        mapper.connect("/cloudpipe/{path_info:.*}", controller=cloudpipe.API())
84
83
        super(API, self).__init__(mapper)
85
84
 
86
85
    @webob.dec.wsgify