summaryrefslogtreecommitdiff
path: root/keystone/api/ec2tokens.py
diff options
context:
space:
mode:
authorMorgan Fainberg <morgan.fainberg@gmail.com>2018-10-12 10:30:04 -0700
committerMorgan Fainberg <morgan.fainberg@gmail.com>2018-10-12 11:18:41 -0700
commit5c70aef2dacf801ccc147be4450e5985f545a855 (patch)
tree3dbfd5daf333b3ea22a19add60fd299f4de5bad5 /keystone/api/ec2tokens.py
parentce93950f44b76b409a59d346758360df2a94cdc5 (diff)
downloadkeystone-5c70aef2dacf801ccc147be4450e5985f545a855.tar.gz
Make collection_key and member_key raise if unset
Instead of populating with __UNUSED__ or other silly string, make direct use of "collection_key" or "member_key" raise a ValueError if they are unset and referenced. Change-Id: Idf4f4df9d933317fff96a474cdf23d758ebdfa8c Partial-Bug: #1776504
Diffstat (limited to 'keystone/api/ec2tokens.py')
-rw-r--r--keystone/api/ec2tokens.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/keystone/api/ec2tokens.py b/keystone/api/ec2tokens.py
index f3b23ab3b..d10b429b9 100644
--- a/keystone/api/ec2tokens.py
+++ b/keystone/api/ec2tokens.py
@@ -30,9 +30,6 @@ CRED_TYPE_EC2 = 'ec2'
class EC2TokensResource(EC2_S3_Resource.ResourceBase):
- collection_key = '__UNUSED__'
- member_key = '__UNUSED__'
-
@staticmethod
def _check_signature(creds_ref, credentials):
signer = ec2_utils.Ec2Signer(creds_ref['secret'])