openstack/charm-swift-proxy
Code Issues Proposed changes

Keep ipv6 addr check in assess_status

Browse Source
This commit is contained in:
David Ames
2015-11-06 08:48:47 -08:00
parent 683247aaf0
commit c1ff7bc4ce
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/swift_utils.py
View File

@@ -1057,6 +1057,15 @@ def assess_status(configs):
status_set('blocked', 'Not enough storage zones for minimum replicas') status_set('blocked', 'Not enough storage zones for minimum replicas')
return return
if config('prefer-ipv6'):
for rid in relation_ids('swift-storage'):
for unit in related_units(rid):
addr = relation_get(attribute='private-address', unit=unit,
rid=rid)
if not format_ipv6_addr(addr):
status_set('blocked', 'Did not get IPv6 address from '
'storage relation (got=%s)' % (addr))
if relation_ids('identity-service'): if relation_ids('identity-service'):
required_interfaces['identity'] = ['identity-service'] required_interfaces['identity'] = ['identity-service']