Merge "Fix placement operations in multi-region deployments"
This commit is contained in:
commit
8212d46d3e
|
@ -56,6 +56,7 @@ class BlazarPlacementClient(object):
|
||||||
project_domain_name = kwargs.pop('project_domain_name',
|
project_domain_name = kwargs.pop('project_domain_name',
|
||||||
CONF.os_admin_project_domain_name)
|
CONF.os_admin_project_domain_name)
|
||||||
auth_url = kwargs.pop('auth_url', None)
|
auth_url = kwargs.pop('auth_url', None)
|
||||||
|
region_name = kwargs.pop('region_name', CONF.os_region_name)
|
||||||
|
|
||||||
if auth_url is None:
|
if auth_url is None:
|
||||||
auth_url = "%s://%s:%s/%s/%s" % (CONF.os_auth_protocol,
|
auth_url = "%s://%s:%s/%s/%s" % (CONF.os_auth_protocol,
|
||||||
|
@ -77,6 +78,7 @@ class BlazarPlacementClient(object):
|
||||||
client = adapter.Adapter(session=sess,
|
client = adapter.Adapter(session=sess,
|
||||||
service_type='placement',
|
service_type='placement',
|
||||||
interface='public',
|
interface='public',
|
||||||
|
region_name=region_name,
|
||||||
additional_headers=headers)
|
additional_headers=headers)
|
||||||
return client
|
return client
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
Fixes placement operations in multi-region deployments.
|
Loading…
Reference in New Issue