openstack/heat
Code Issues Proposed changes

Merge "Skip loading auth plugin in case the property is set"

Browse Source
This commit is contained in:
Zuul
2023-09-05 06:43:14 +00:00
committed by Gerrit Code Review
parent a4ac653e35 7197bd028b
commit 17ed569181
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.zuul.yaml
View File

@@ -30,6 +30,7 @@
TEMPEST_PLUGINS: '/opt/stack/heat-tempest-plugin'
HEAT_USE_MOD_WSGI: True
CEILOMETER_PIPELINE_INTERVAL: 60
GLOBAL_VENV: False
devstack_services:
tls-proxy: false
s-account: false

15
heat/common/context.py
View File

@@ -297,8 +297,9 @@ class StoredContext(RequestContext):
@property
def roles(self):
if not getattr(self, '_keystone_loaded', False):
self._load_keystone_data()
if self._roles is None:
if not getattr(self, '_keystone_loaded', False):
self._load_keystone_data()
return self._roles
@roles.setter
@@ -307,8 +308,9 @@ class StoredContext(RequestContext):
@property
def user_domain_id(self):
if not getattr(self, '_keystone_loaded', False):
self._load_keystone_data()
if self._user_domain_id is None:
if not getattr(self, '_keystone_loaded', False):
self._load_keystone_data()
return self._user_domain_id
@user_domain_id.setter
@@ -317,8 +319,9 @@ class StoredContext(RequestContext):
@property
def project_domain_id(self):
if not getattr(self, '_keystone_loaded', False):
self._load_keystone_data()
if self._project_domain_id is None:
if not getattr(self, '_keystone_loaded', False):
self._load_keystone_data()
return self._project_domain_id
@project_domain_id.setter