openstack/mistral
Code Issues Proposed changes

Merge "[Regions] Fixing determining keystone for actions"

Browse Source
This commit is contained in:
Jenkins
2017-05-23 12:55:09 +00:00
committed by Gerrit Code Review
parent 1a8f8112a8 0f450d38dd
commit c3a576e090
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mistral/utils/openstack/keystone.py
View File

@@ -82,8 +82,13 @@ def get_endpoint_for_project(service_name=None, service_type=None,
# When region_name is not passed, first get from context as region_name
# could be passed to rest api in http header ('X-Region-Name'). Otherwise,
# just get region from mistral configuration.
region = (region_name or ctx.region_name or
CONF.openstack_actions.default_region)
region = (region_name or ctx.region_name)
if service_name == 'keystone':
# Determining keystone endpoint should be done using
# keystone_authtoken section as this option is special for keystone.
region = region or CONF.keystone_authtoken.region_name
else:
region = region or CONF.openstack_actions.default_region
service_endpoints = service_catalog.get_endpoints(
service_name=service_name,