← Back to branch summary

~openstack-charmers-archive/charms/precise/swift-proxy/trunk

« back to all changes in this revision

Viewing changes to lib/swift_utils.py

  • Committer: Liam Young
  • Date: 2016-01-28 09:03:50 UTC
  • Revision ID: liam.young@canonical.com-20160128090350-tl7hj01pgi0r28im
16.01 Charm release

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/swift_utils.py
60
60
from charmhelpers.contrib.network.ip import (
61
61
    format_ipv6_addr,
62
62
    get_ipv6_addr,
 
63
    is_ipv6,
63
64
)
64
65
from charmhelpers.core.decorators import (
65
66
    retry_on_exception,
1057
1058
        status_set('blocked', 'Not enough storage zones for minimum replicas')
1058
1059
        return
1059
1060
 
 
1061
    if config('prefer-ipv6'):
 
1062
        for rid in relation_ids('swift-storage'):
 
1063
            for unit in related_units(rid):
 
1064
                addr = relation_get(attribute='private-address', unit=unit,
 
1065
                                    rid=rid)
 
1066
                if not is_ipv6(addr):
 
1067
                    status_set('blocked', 'Did not get IPv6 address from '
 
1068
                               'storage relation (got=%s)' % (addr))
 
1069
                    return
 
1070
 
1060
1071
    if relation_ids('identity-service'):
1061
1072
        required_interfaces['identity'] = ['identity-service']
1062
1073