Merge lp:~corey.bryant/python-keystoneclient/juno-http_connect_timeout into lp:~ubuntu-server-dev/python-keystoneclient/juno

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-06 09:28:41 +0000
+++ debian/changelog	2015-08-07 17:11:23 +0000
@@ -1,3 +1,10 @@
+python-keystoneclient (1:0.10.1-0ubuntu1.2~cloud0) UNRELEASED; urgency=medium
+
+  * debian/patches/fix-1368545.patch: Changing the value type of
+    http_connect_timeout to IntOpt. (LP: #1368545)
+
+ -- Jorge Niedbalski <[e-mail]>  Fri, 07 Aug 2015 11:20:52 -0300
+
 python-keystoneclient (1:0.10.1-0ubuntu1.1~cloud0) trusty-juno; urgency=medium
 
   * SECURITY UPDATE: incorrect cert verification with ssl_insecure option

=== added file 'debian/patches/fix-1368545.patch'
--- debian/patches/fix-1368545.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-1368545.patch	2015-08-07 17:11:23 +0000
@@ -0,0 +1,25 @@
+Description: Changing the value type of http_connect_timeout
+
+The value type of http_connect_timeout definition
+is changed from Bool to Int value. Python treats
+a value more than 1 as True but oslo config defines
+Boolean values as 'true, '1', 'yes' and 'on'.
+So http_connect_timeout is only configured 1 or None.
+
+Change-Id: I53075cc04d0ccea543f8e657279534208ed03058
+Closes-bug: #1368545.
+
+Origin: upstream, https://review.openstack.org/#/c/126543
+Bug-Ubuntu: https://bugs.launchpad.net/keystonemiddleware/+bug/1368545
+
+--- python-keystoneclient-0.7.1.orig/keystoneclient/middleware/auth_token.py
++++ python-keystoneclient-0.7.1/keystoneclient/middleware/auth_token.py
+@@ -212,7 +212,7 @@ opts = [
+                 help='Do not handle authorization requests within the'
+                 ' middleware, but delegate the authorization decision to'
+                 ' downstream WSGI components'),
+-    cfg.BoolOpt('http_connect_timeout',
++    cfg.IntOpt('http_connect_timeout',
+                 default=None,
+                 help='Request timeout value for communicating with Identity'
+                 ' API server.'),

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-08-06 09:28:41 +0000
+++ debian/patches/series	2015-08-07 17:11:23 +0000
@@ -1,2 +1,3 @@
+fix-1368545.patch
 CVE-2014-7144.patch
 CVE-2015-1852.patch