From 62764b727b3e1c3762ad54679253d2042a960297 Mon Sep 17 00:00:00 2001
From: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date: Wed, 28 Oct 2015 14:04:48 +0000
Subject: [PATCH] [hopem,r=]

Be tolerant of swift-storage-relation not ready yet
Closes-Bug: 1510940
---
 hooks/swift_hooks.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/hooks/swift_hooks.py b/hooks/swift_hooks.py
index e3b4b25..f7a60a8 100755
--- a/hooks/swift_hooks.py
+++ b/hooks/swift_hooks.py
@@ -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)