heat API : move aws common files from api/v1 to api/aws

Move aws api common files to common directory
(so they can be more easily reused by cloudwatch)

Change-Id: I1a455ef11226dd960503bac5d79fa5c28607a1f6
Signed-off-by: Steven Hardy <shardy@redhat.com>
This commit is contained in:
Steven Hardy 2012-08-21 11:01:25 +01:00
parent d7abb038c5
commit 9ccf18433e
7 changed files with 18 additions and 4 deletions

View File

@ -63,7 +63,7 @@ heat.filter_factory = heat.api.middleware.cache_manage:CacheManageFilter
paste.filter_factory = heat.common.context:ContextMiddleware_filter_factory paste.filter_factory = heat.common.context:ContextMiddleware_filter_factory
[filter:ec2authtoken] [filter:ec2authtoken]
paste.filter_factory = heat.api.v1.ec2token:EC2Token_filter_factory paste.filter_factory = heat.api.aws.ec2token:EC2Token_filter_factory
auth_uri = http://127.0.0.1:5000/v2.0 auth_uri = http://127.0.0.1:5000/v2.0
keystone_ec2_uri = http://localhost:5000/v2.0/ec2tokens keystone_ec2_uri = http://localhost:5000/v2.0/ec2tokens

14
heat/api/aws/__init__.py Normal file
View File

@ -0,0 +1,14 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.

View File

@ -28,7 +28,7 @@ from webob import Request
import webob import webob
from heat import utils from heat import utils
from heat.common import context from heat.common import context
from heat.api.v1 import exception from heat.api.aws import exception
from heat.openstack.common import log as logging from heat.openstack.common import log as logging

View File

@ -24,7 +24,7 @@ import sys
import re import re
import urlparse import urlparse
import webob import webob
from heat.api.v1 import exception from heat.api.aws import exception
from heat.common import wsgi from heat.common import wsgi
from heat.common import config from heat.common import config
from heat.common import context from heat.common import context

View File

@ -32,7 +32,7 @@ from heat.openstack.common import cfg
from heat.openstack.common import rpc from heat.openstack.common import rpc
import heat.openstack.common.rpc.common as rpc_common import heat.openstack.common.rpc.common as rpc_common
from heat.common.wsgi import Request from heat.common.wsgi import Request
from heat.api.v1 import exception from heat.api.aws import exception
import heat.api.v1.stacks as stacks import heat.api.v1.stacks as stacks