openstack
/
charm-neutron-api
Code Issues Proposed changes

more

This commit is contained in:
Edward Hope-Morley 2014-09-26 19:56:11 +01:00
parent e40da31d14
commit 695341fefa
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hooks/charmhelpers/contrib/openstack/utils.py
View File

@ -466,10 +466,10 @@ def get_hostname(address, fqdn=True):
return result.split('.')[0]
def sync_db_with_multi_ipv6_addresses():
def sync_db_with_multi_ipv6_addresses(database, database_user):
hosts = get_ipv6_addr(dynamic_only=False)
for rid in relation_ids('shared-db'):
relation_set(relation_id=rid,
database=config('database'),
username=config('database-user'),
database=database,
username=database_user,
hostname=json.dumps(hosts))

6
hooks/neutron_api_hooks.py
View File

@ -106,7 +106,8 @@ def install():
def config_changed():
if config('prefer-ipv6'):
setup_ipv6()
sync_db_with_multi_ipv6_addresses()
sync_db_with_multi_ipv6_addresses(config('database'),
config('database-user'))
global CONFIGS
if openstack_upgrade_available('neutron-server'):
@ -149,7 +150,8 @@ def db_joined():
raise Exception(e)
if config('prefer-ipv6'):
sync_db_with_multi_ipv6_addresses()
sync_db_with_multi_ipv6_addresses(config('database'),
config('database-user'))
else:
host = unit_get('private-address')
relation_set(database=config('database'),