← Back to branch summary

~corey.bryant/charms/trusty/neutron-api/db-stamp

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/contrib/openstack/ip.py

  • Committer: james.page at ubuntu
  • Date: 2014-10-01 21:05:24 UTC
  • mfrom: (39.3.25 ipv6)
  • Revision ID: james.page@ubuntu.com-20141001210524-z6uqyljzorphrhy6
[xianghui,dosaboy,r=james-page,t=gema] Add IPv6 support using prefer-ipv6 flag

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/ip.py
7
7
    get_address_in_network,
8
8
    is_address_in_network,
9
9
    is_ipv6,
 
10
    get_ipv6_addr,
10
11
)
11
12
 
12
13
from charmhelpers.contrib.hahelpers.cluster import is_clustered
64
65
                        vip):
65
66
                    resolved_address = vip
66
67
    else:
 
68
        if config('prefer-ipv6'):
 
69
            fallback_addr = get_ipv6_addr(exc_list=[config('vip')])[0]
 
70
        else:
 
71
            fallback_addr = unit_get(_address_map[endpoint_type]['fallback'])
67
72
        resolved_address = get_address_in_network(
68
 
            config(_address_map[endpoint_type]['config']),
69
 
            unit_get(_address_map[endpoint_type]['fallback'])
70
 
        )
 
73
            config(_address_map[endpoint_type]['config']), fallback_addr)
 
74
 
71
75
    if resolved_address is None:
72
76
        raise ValueError('Unable to resolve a suitable IP address'
73
77
                         ' based on charm state and configuration')