diff options
| author | Lance Bragstad <lbragstad@gmail.com> | 2016-10-04 18:25:44 +0000 |
|---|---|---|
| committer | Dolph Mathews <dolph.mathews@gmail.com> | 2016-10-04 23:26:00 -0500 |
| commit | 724ac7f1735a615ac5e538d7a331573dbd774255 (patch) | |
| tree | b62a65d8b7c69a2975a5622c337260b2b7b7fac9 | |
| parent | 65205235f6f3bd2960083979a42770e56b376f5b (diff) | |
| download | keystone-724ac7f1735a615ac5e538d7a331573dbd774255.tar.gz | |
Make returning is_domain conditional
During an upgrade, a node running this code may need to handle a
persisted token (UUID, PKI, or PKIZ) created without this attribute.
Closes-Bug: 1630259
Change-Id: I0c5959b6491bb13a02eb1b9b7e7e37d2f2d73f85
(cherry picked from commit 4fd55f230b69d305ceb98e3066766868f63a7e09)
| -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 |