openstack
/
charm-swift-proxy
Code Issues Proposed changes

[hopem,r=] 

Be tolerant of swift-storage-relation not ready yet
Closes-Bug: 1510940
This commit is contained in:
Edward Hope-Morley 2015-10-28 14:04:48 +00:00
parent 9c3f22e593
commit 62764b727b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hooks/swift_hooks.py
View File

@ -207,9 +207,11 @@ def storage_changed():
if config('prefer-ipv6'):
host_ip = format_ipv6_addr(addr)
if not host_ip:
errmsg = ("Did not get IPv6 address from storage relation "
"(got=%s)" % (addr))
raise SwiftProxyCharmException(errmsg)
msg = ("Did not get IPv6 address from storage relation "
"(got=%s) - ignoring storage relation until remote unit is "
"ready" % (addr))
log(msg, level=WARNING)
return
else:
host_ip = openstack.get_host_ip(addr)