diff options
| author | Todd Willey <todd@ansolabs.com> | 2011-01-12 17:35:09 -0500 |
|---|---|---|
| committer | Todd Willey <todd@ansolabs.com> | 2011-01-12 17:35:09 -0500 |
| commit | 038c9c7663ee1a884726521afe181d30ebe00cc6 (patch) | |
| tree | da84fd2b309e195854532ead861b45d871d4ee07 /nova/api | |
| parent | 6ebf9bb2db0aaad607e35e516bb6d7ffc971c5de (diff) | |
| parent | 67307428d6d6f47f3215f485a1af720013a5c2ae (diff) | |
| download | nova-038c9c7663ee1a884726521afe181d30ebe00cc6.tar.gz nova-038c9c7663ee1a884726521afe181d30ebe00cc6.tar.xz nova-038c9c7663ee1a884726521afe181d30ebe00cc6.zip | |
Merge trunk and handle flagfiles with kid-gloves in nova-api. Rename some flags for clarity.
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/__init__.py | 3 | ||||
| -rw-r--r-- | nova/api/ec2/cloud.py | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py index 1286be5ea..d0adf5e21 100644 --- a/nova/api/ec2/__init__.py +++ b/nova/api/ec2/__init__.py @@ -278,8 +278,7 @@ class Authorizer(wsgi.Middleware): return self.application else: LOG.audit(_("Unauthorized request for controller=%s " - "and action=%s"), controller_name, action, - context=context) + "and action=%s"), controller, action, context=context) raise webob.exc.HTTPUnauthorized() def _matches_any_role(self, context, roles): diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 832426b94..e5308ca87 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -263,15 +263,15 @@ class CloudController(object): name, _sep, host = region.partition('=') endpoint = '%s://%s:%s%s' % (FLAGS.ec2_prefix, host, - FLAGS.cc_port, + FLAGS.ec2_port, FLAGS.ec2_suffix) regions.append({'regionName': name, 'regionEndpoint': endpoint}) else: regions = [{'regionName': 'nova', 'regionEndpoint': '%s://%s:%s%s' % (FLAGS.ec2_prefix, - FLAGS.cc_host, - FLAGS.cc_port, + FLAGS.ec2_host, + FLAGS.ec2_port, FLAGS.ec2_suffix)}] return {'regionInfo': regions} |