Fix gate for newton

The gate is wedged and this is a combination of two commits.

1. Auth token, set the correct charset

Explicit set the charset to UTF-8 when replying with 401. It's now
required by webob.

A previous attempt to fix this problem was introduced as part of the
commit 20fb1dbe5a but this is only
compatible with the version 1.7.0 of WebOb, older versions will break.
See:
http://logs.openstack.org/05/371605/12/check/gate-ironic-python35-db/686bd86/console.html#_2017-01-03_11_10_11_760197

Change-Id: I30adc87882ce8bd2c18588161d5c60d77a56925e
Closes-Bug: #1653646
(cherry-picked from: 2092d57836)

2. Add docutils contraint on 0.13.1 to fix building

See:
http://lists.openstack.org/pipermail/openstack-dev/2016-December/108742.html

Change-Id: Ied3c922b8bbb52a3589c2f5308ecf87fc1415fbc
(cherry-picked from: 29a879c0ed)
This commit is contained in:
Lucas Alvares Gomes 2017-01-03 10:12:12 +00:00 committed by Steve Martinelli
parent 4df2cc4aba
commit 5eebd22ccf
2 changed files with 2 additions and 0 deletions

View File

@ -579,6 +579,7 @@ class AuthProtocol(BaseAuthProtocol):
raise webob.exc.HTTPUnauthorized(
body=jsonutils.dumps(body),
headers=self._reject_auth_headers,
charset='UTF-8',
content_type='application/json')
if request.user_token_valid:

View File

@ -6,6 +6,7 @@ hacking<0.11,>=0.10.0
flake8-docstrings==0.2.1.post1 # MIT
coverage>=3.6 # Apache-2.0
docutils>=0.11,!=0.13.1 # OSI-Approved Open Source, Public Domain
fixtures>=3.0.0 # Apache-2.0/BSD
mock>=2.0 # BSD
pycrypto>=2.6 # Public Domain