Merge lp:~gnuoy/charms/trusty/swift-storage/stable-1318083 into lp:~openstack-charmers-archive/charms/trusty/swift-storage/trunk

[Liam Young]

[Chris Glass (tribaal)]

+1, this is a reasonable fix, with non-critical inline comments.

review: Approve

[Liam Young (gnuoy)]

I agree with your comments but I'm going to go ahead with the proposed fix unaltered as you're happy with the fix as it stands and I'm cherry-picking from the 'next' branches where the fix has been tested out by James Page.

=== modified file 'hooks/swift_storage_utils.py'
--- hooks/swift_storage_utils.py	2014-07-31 10:42:35 +0000
+++ hooks/swift_storage_utils.py	2014-08-20 07:54:40 +0000
@@ -200,7 +200,8 @@
     for server in ['account', 'object', 'container']:
         url = '%s/%s.ring.gz' % (rings_url, server)
         log('Fetching %s.' % url)
-        cmd = ['wget', url, '-O', '/etc/swift/%s.ring.gz' % server]
+        cmd = ['wget', url, '--retry-connrefused',
+               '-t', '10', '-O', '/etc/swift/%s.ring.gz' % server]
         check_call(cmd)