diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-02-25 13:59:26 -0800 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-02-25 13:59:26 -0800 |
| commit | 6f72ba3d88f31e6336725bcffe47fa2bd5f1dba0 (patch) | |
| tree | 5c558286c6926a0d7edfa07fc529f5ee2e5b1653 /nova/api | |
| parent | eab99bbcdb02aa9bd330b01f2d27a297ab6b7f2e (diff) | |
| parent | f3efbaa3d10997038e32c6e5e53dfef117236247 (diff) | |
| download | nova-6f72ba3d88f31e6336725bcffe47fa2bd5f1dba0.tar.gz nova-6f72ba3d88f31e6336725bcffe47fa2bd5f1dba0.tar.xz nova-6f72ba3d88f31e6336725bcffe47fa2bd5f1dba0.zip | |
merge with zones2 fixes and trunk
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/__init__.py | 6 | ||||
| -rw-r--r-- | nova/api/openstack/servers.py | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py index 5adc2c075..4425ba3cd 100644 --- a/nova/api/ec2/__init__.py +++ b/nova/api/ec2/__init__.py @@ -198,6 +198,12 @@ class Requestify(wsgi.Middleware): try: # Raise KeyError if omitted action = req.params['Action'] + # Fix bug lp:720157 for older (version 1) clients + version = req.params['SignatureVersion'] + if int(version) == 1: + non_args.remove('SignatureMethod') + if 'SignatureMethod' in args: + args.pop('SignatureMethod') for non_arg in non_args: # Remove, but raise KeyError if omitted args.pop(non_arg) diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index c2bf42b72..85999764f 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -450,7 +450,7 @@ class Controller(wsgi.Controller): _("Cannot build from image %(image_id)s, status not active") % locals()) - if image['type'] != 'machine': + if image['disk_format'] != 'ami': return None, None try: |