summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-09-20 10:02:46 +0000
committerGerrit Code Review <review@openstack.org>2020-09-20 10:02:46 +0000
commit8e1e3d6011ba28f8a0e6ca7c09d1e61660a75f3f (patch)
tree7ed9f5525c97396c47c44a0f78d8e231aa164d70
parent9efbec6cd95730c189b33df7c7be70e67c59f845 (diff)
parent402750b099c229eee5d2ce29a32cb3c3086c14c4 (diff)
downloadheat-8e1e3d6011ba28f8a0e6ca7c09d1e61660a75f3f.tar.gz
Merge "Set context username if session client is used"15.0.0.0rc115.0.0
-rw-r--r--heat/common/context.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/heat/common/context.py b/heat/common/context.py
index 7a1827cda..64eef397a 100644
--- a/heat/common/context.py
+++ b/heat/common/context.py
@@ -106,6 +106,8 @@ class RequestContext(context.RequestContext):
self.username = username
self.password = password
+ if username is None and password is None:
+ self.username = self.user_name
self.region_name = region_name
self.aws_creds = aws_creds
self.project_name = project_name