openstack/deb-heat
Code Issues Proposed changes

Store user_domain in self._user_domain_id

Browse Source 
Storing in self._user_domain was actually relying on the
oslo_context.RequestContext also storing in self._user_domain, however
this was renamed in change I203acefae8270bd3373b006fa096bea5ef3106f3
to _user_domain_id.

This change switches to _user_domain_id, which avoids infinite
recursion in the heat tripleo undercloud installer.

Change-Id: I1114611f6765e94dcab74943078066bb096f4078
Closes-Bug: #1663013
(cherry picked from commit b44b0c6970)
This commit is contained in:
Steve Baker 2017-02-09 00:02:34 +00:00 committed by Thomas Herve
parent 4608336a6e
commit 9990fac9e0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/common/context.py
View File

@ -317,11 +317,11 @@ class StoredContext(RequestContext):
def user_domain(self):
if not getattr(self, '_keystone_loaded', False):
self._load_keystone_data()
return self._user_domain
return self._user_domain_id
@user_domain.setter
def user_domain(self, user_domain):
self._user_domain = user_domain
self._user_domain_id = user_domain
@property
def project_domain(self):