Merge "Make swift timeout configurable"

gnocchi/storage/swift.py

@@ -50,6 +50,10 @@ OPTS = [
     cfg.StrOpt('swift_container_prefix',
                default='gnocchi',
                help='Prefix to namespace metric containers.'),
+    cfg.IntOpt('swift_timeout',
+               min=0,
+               default=300,
+               help='Connection timeout in seconds.'),
 ]
 
 
@@ -66,7 +70,8 @@ class SwiftStorage(_carbonara.CarbonaraBasedStorage):
             preauthtoken=conf.swift_preauthtoken,
             user=conf.swift_user,
             key=conf.swift_key,
-            tenant_name=conf.swift_tenant_name)
+            tenant_name=conf.swift_tenant_name,
+            timeout=conf.swift_timeout)
         self._lock = _carbonara.CarbonaraBasedStorageToozLock(conf)
         self._container_prefix = conf.swift_container_prefix
         self.swift.put_container(self.MEASURE_PREFIX)

requirements.txt

@@ -9,7 +9,7 @@ oslo.middleware
 oslosphinx>=2.2.0  # Apache-2.0
 pandas>=0.17.0
 pecan>=0.9
-python-swiftclient
+python-swiftclient>=2.5.0
 pytimeparse>=1.1.5
 futures
 requests