From 8218cb261db734be64a2222136fc18fa05174602 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sun, 29 Mar 2015 01:38:00 -0400
Subject: [PATCH] Pass socket timeout to swiftclient

Needs a release of swiftclient containing the depended-on patch.

We're passing timeout to everyone else now, so for consistency, we
should pass it to swiftclient too.

Depends-On: I699ebb1e092aa010af678de7ba15712da6ed5315
Change-Id: I864403e0ac32f2645026dd13189a03cb9b0eeb01
---
 requirements.txt                | 2 +-
 shade/__init__.py               | 1 +
 shade/tests/unit/test_object.py | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index ea31f8e94..863827c17 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,7 @@ python-cinderclient<1.2
 python-neutronclient>=2.3.10
 python-troveclient
 python-ironicclient>=0.5.1
-python-swiftclient
+python-swiftclient>=2.5.0
 python-designateclient>=1.3.0
 
 dogpile.cache>=0.5.3
diff --git a/shade/__init__.py b/shade/__init__.py
index 3420e7e72..549f8096a 100644
--- a/shade/__init__.py
+++ b/shade/__init__.py
@@ -694,6 +694,7 @@ class OpenStackCloud(object):
                         auth_token=token,
                         object_storage_url=endpoint,
                         region_name=self.region_name),
+                    timeout=self.api_timeout,
                 )
             except OpenStackCloudException:
                 raise
diff --git a/shade/tests/unit/test_object.py b/shade/tests/unit/test_object.py
index 7ec2f735b..6c19bb35e 100644
--- a/shade/tests/unit/test_object.py
+++ b/shade/tests/unit/test_object.py
@@ -42,6 +42,7 @@ class TestObject(base.TestCase):
             preauthurl='danzig',
             preauthtoken='yankee',
             auth_version='2',
+            timeout=None,
             os_options=dict(
                 object_storage_url='danzig',
                 auth_token='yankee',