openstack
/
charm-openstack-dashboard
Code Issues Proposed changes

Network space aware address for cluster relation 

Use the get_relation_ip function for selecting addresses for the
cluster relationship.

Change-Id: Ie1cc2e6d3f5975b6d69205ed75c06210189a885c
Partial-Bug: #1687439
This commit is contained in:
David Ames 2017-05-05 10:33:49 -07:00
parent 1cdefcb5e9
commit ad5f2f7b42
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hooks/horizon_hooks.py
View File

@ -71,7 +71,6 @@ from horizon_utils import (
from charmhelpers.contrib.network.ip import (
get_iface_for_address,
get_netmask_for_address,
get_ipv6_addr,
is_ipv6,
get_relation_ip,
)
@ -189,10 +188,9 @@ def keystone_changed():
@hooks.hook('cluster-relation-joined')
def cluster_joined(relation_id=None):
if config('prefer-ipv6'):
private_addr = get_ipv6_addr(exc_list=[config('vip')])[0]
relation_set(relation_id=relation_id,
relation_settings={'private-address': private_addr})
private_addr = get_relation_ip('cluster')
relation_set(relation_id=relation_id,
relation_settings={'private-address': private_addr})
@hooks.hook('cluster-relation-departed',