openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Merge "Add region awareness to the neutron ha tool"

Browse Source
This commit is contained in:
Jenkins 2016-11-29 17:21:27 +00:00 committed by Gerrit Code Review
commit 015735c015
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
templates/neutron-ha-tool.py.j2
View File

@ -153,6 +153,9 @@ def run(args):
kclient_kwargs['insecure'] = args.insecure kclient_kwargs['insecure'] = args.insecure
kclient_kwargs['ca_cert'] = ca kclient_kwargs['ca_cert'] = ca
kclient_kwargs['auth_url'] = os.environ['OS_AUTH_URL'] kclient_kwargs['auth_url'] = os.environ['OS_AUTH_URL']
# Set the region if one is defined
if 'OS_REGION_NAME' in os.environ:
kclient_kwargs['region_name'] = os.environ['OS_REGION_NAME']
tenant_name = os.getenv('OS_TENANT_NAME') tenant_name = os.getenv('OS_TENANT_NAME')
if tenant_name and auth_version != 3: if tenant_name and auth_version != 3: