← Back to branch summary

~james-page/charms/trusty/cinder/https-multi-network

« 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 22:07:44 UTC
  • mfrom: (45.1.1 cinder)
  • Revision ID: james.page@ubuntu.com-20141001220744-v35hu9iblt15phc7
Rebase and resync

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/ip.py
66
66
                    resolved_address = vip
67
67
    else:
68
68
        if config('prefer-ipv6'):
69
 
            fallback_addr = get_ipv6_addr()
 
69
            fallback_addr = get_ipv6_addr(exc_list=[config('vip')])[0]
70
70
        else:
71
71
            fallback_addr = unit_get(_address_map[endpoint_type]['fallback'])
72
72
        resolved_address = get_address_in_network(