diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-05 08:08:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-05 08:08:59 +0000 |
| commit | 339e7cc798aed24b7697980eb7cf8e20498d436d (patch) | |
| tree | 8e8c9d8c11c66c13a34879587df6c49b415a531c | |
| parent | 4a604529a82db04d9ab2225005dbaf836f4a079a (diff) | |
| parent | 724ac7f1735a615ac5e538d7a331573dbd774255 (diff) | |
| download | keystone-339e7cc798aed24b7697980eb7cf8e20498d436d.tar.gz | |
Merge "Make returning is_domain conditional" into stable/newton10.0.0.0rc310.0.0
| -rw-r--r-- | keystone/models/token_model.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/keystone/models/token_model.py b/keystone/models/token_model.py index 86d0c5a2d..b662d941d 100644 --- a/keystone/models/token_model.py +++ b/keystone/models/token_model.py @@ -210,7 +210,8 @@ class KeystoneToken(dict): @property def is_domain(self): if self.version is V3: - return self['is_domain'] + if 'is_domain' in self: + return self['is_domain'] return False @property |