← Back to branch summary

~1chb1n/charms/trusty/neutron-gateway/next-amulet-15.10

« back to all changes in this revision

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

  • Committer: Liam Young
  • Date: 2015-09-28 09:44:36 UTC
  • Revision ID: liam.young@canonical.com-20150928094436-6szhqhvpxo4yc2nh
[gnuoy,trivial] ch sync

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/utils.py
54
54
)
55
55
 
56
56
from charmhelpers.contrib.network.ip import (
57
 
    get_ipv6_addr
 
57
    get_ipv6_addr,
 
58
    is_ipv6,
58
59
)
59
60
 
60
61
from charmhelpers.contrib.python.packages import (
519
520
                                      relation_prefix=None):
520
521
    hosts = get_ipv6_addr(dynamic_only=False)
521
522
 
 
523
    if config('vip'):
 
524
        vips = config('vip').split()
 
525
        for vip in vips:
 
526
            if vip and is_ipv6(vip):
 
527
                hosts.append(vip)
 
528
 
522
529
    kwargs = {'database': database,
523
530
              'username': database_user,
524
531
              'hostname': json.dumps(hosts)}