openstack/shade
Code Issues Proposed changes

Merge "Pass socket timeout to swiftclient"

Browse Source
This commit is contained in:
Jenkins 2015-07-31 07:27:44 +00:00 committed by Gerrit Code Review
commit 02ba7dde93
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@ -13,7 +13,7 @@ python-cinderclient<1.2
python-neutronclient>=2.3.10 python-neutronclient>=2.3.10
python-troveclient python-troveclient
python-ironicclient>=0.5.1 python-ironicclient>=0.5.1
python-swiftclient python-swiftclient>=2.5.0
python-designateclient>=1.3.0 python-designateclient>=1.3.0
dogpile.cache>=0.5.3 dogpile.cache>=0.5.3

1
shade/__init__.py
View File

@ -694,6 +694,7 @@ class OpenStackCloud(object):
auth_token=token, auth_token=token,
object_storage_url=endpoint, object_storage_url=endpoint,
region_name=self.region_name), region_name=self.region_name),
timeout=self.api_timeout,
) )
except OpenStackCloudException: except OpenStackCloudException:
raise raise

1
shade/tests/unit/test_object.py
View File

@ -42,6 +42,7 @@ class TestObject(base.TestCase):
preauthurl='danzig', preauthurl='danzig',
preauthtoken='yankee', preauthtoken='yankee',
auth_version='2', auth_version='2',
timeout=None,
os_options=dict( os_options=dict(
object_storage_url='danzig', object_storage_url='danzig',
auth_token='yankee', auth_token='yankee',