openstack
/
charm-neutron-api
Code Issues Proposed changes

Sync ~xianghui/charm-helpers/format-ipv6, format auth_host

This commit is contained in:
Hui Xiang 2014-09-22 20:41:13 +08:00
parent adc2f797c4
commit 359ba88b78
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hooks/charmhelpers/contrib/openstack/context.py
View File

@ -250,11 +250,13 @@ class IdentityServiceContext(OSContextGenerator):
rdata = relation_get(rid=rid, unit=unit)
serv_host = rdata.get('service_host')
serv_host = format_ipv6_addr(serv_host) or serv_host
auth_host = rdata.get('auth_host')
auth_host = format_ipv6_addr(auth_host) or auth_host
ctxt = {
'service_port': rdata.get('service_port'),
'service_host': serv_host,
'auth_host': rdata.get('auth_host'),
'auth_host': auth_host,
'auth_port': rdata.get('auth_port'),
'admin_tenant_name': rdata.get('service_tenant'),
'admin_user': rdata.get('service_username'),