]> review.fuel-infra Code Review - openstack-build/cinder-build.git/commit
Added glance_request_timeout config option.
authorEdward Hope-Morley <edward.hope-morley@canonical.com>
Wed, 31 Jul 2013 16:26:32 +0000 (17:26 +0100)
committerEdward Hope-Morley <edward.hope-morley@canonical.com>
Wed, 7 Aug 2013 16:00:48 +0000 (17:00 +0100)
commite5a4c752290fb35572dc5990c1688e5f9d49051f
tree21e789b532628882bec93baac1005f390d620037
parentf2c91c9a3c7efd9799400c2baa91d544803d5233
Added glance_request_timeout config option.

The glanceclient supports a timeout for http/https
connections but this is not configurable in cinder.
This patch adds a glance_request_timeout
option to cinder.conf. If unset, None is applied thus
allowing glanceclient to use its default value (600).

Change-Id: Ic689ecb5d5ee8257964b341b5a7980d5733343dc
Fixes: bug #1206992
Co-authored-by: Takahiro Shida <shida@intellilink.co.jp>
cinder/common/config.py
cinder/image/glance.py
cinder/tests/image/test_glance.py
etc/cinder/cinder.conf.sample