openstack
/
mistral
Code Issues Proposed changes

Merge "Get rid of ambiguity in region_name"

This commit is contained in:
Jenkins 2017-05-20 11:24:30 +00:00 committed by Gerrit Code Review
parent 6ae4e10860 c3050df5ac
commit 27c16817d7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mistral/config.py
View File

@ -295,7 +295,11 @@ openstack_actions_opts = [
'trove', 'ironic', 'designate', 'murano', 'tacker', 'senlin',
'aodh', 'gnocchi'],
help=_('List of module names that support region in actions.')
)
),
cfg.StrOpt(
'default_region',
help=_('Default region name for openstack actions supporting region.')
),
]
# note: this command line option is used only from sync_db and

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

@ -83,7 +83,7 @@ def get_endpoint_for_project(service_name=None, service_type=None,
# 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.keystone_authtoken.region_name)
CONF.openstack_actions.default_region)
service_endpoints = service_catalog.get_endpoints(
service_name=service_name,