diff options
| author | Masanori Itoh <itoumsn@nttdata.co.jp> | 2011-03-03 00:12:48 +0900 |
|---|---|---|
| committer | Masanori Itoh <itoumsn@nttdata.co.jp> | 2011-03-03 00:12:48 +0900 |
| commit | 58ac632f8e08b248d234deffdb56fe3a33a25130 (patch) | |
| tree | ec90bba5ce693080452481b41d872beb935f09e5 /nova/api | |
| parent | bb7c1b8c63632c789ed0cd3785a22b7baa90fd83 (diff) | |
| download | nova-58ac632f8e08b248d234deffdb56fe3a33a25130.tar.gz nova-58ac632f8e08b248d234deffdb56fe3a33a25130.tar.xz nova-58ac632f8e08b248d234deffdb56fe3a33a25130.zip | |
Port Todd's lp720157 fix to the current trunk, rev 752.
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/__init__.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py index 5adc2c075..5a63dc8da 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) |