From 9990fac9e00202fbae72c38e3176511644fd93cd Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Thu, 9 Feb 2017 00:02:34 +0000
Subject: [PATCH] Store user_domain in self._user_domain_id

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 b44b0c6970dc6a4d0f46e649d12aaff27a583f45)
---
 heat/common/context.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/heat/common/context.py b/heat/common/context.py
index 35bc516ee..d70897f75 100644
--- a/heat/common/context.py
+++ b/heat/common/context.py
@@ -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):