x/swift3
Code Issues Proposed changes

Bump Swift/Keystone versions to Mitaka Release

Browse Source 
The reason we need to support Mitaka release is to support
Amazon signature v4 staff. This includes a part of sig v4 patch
to enable recent keystone to work well.

Change-Id: I24c0c31f6b02f3832979f29539402f875e73f046
This commit is contained in:
Kota Tsuyuzaki 2016-04-04 03:31:31 -07:00
parent e0ecc08d7c
commit 7fc85eaaaa
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
swift3/test/functional/conf/keystone-paste.ini
View File

@ -48,9 +48,6 @@ paste.filter_factory = keystone.contrib.revoke.routers:RevokeExtension.factory
[filter:url_normalize] [filter:url_normalize]
paste.filter_factory = keystone.middleware:NormalizingFilter.factory paste.filter_factory = keystone.middleware:NormalizingFilter.factory
[filter:sizelimit]
paste.filter_factory = keystone.middleware:RequestBodySizeLimiter.factory
[filter:stats_monitoring] [filter:stats_monitoring]
paste.filter_factory = keystone.contrib.stats:StatsMiddleware.factory paste.filter_factory = keystone.contrib.stats:StatsMiddleware.factory
@ -70,13 +67,13 @@ paste.app_factory = keystone.service:v3_app_factory
paste.app_factory = keystone.service:admin_app_factory paste.app_factory = keystone.service:admin_app_factory
[pipeline:public_api] [pipeline:public_api]
pipeline = sizelimit url_normalize build_auth_context token_auth admin_token_auth json_body ec2_extension user_crud_extension public_service pipeline = url_normalize build_auth_context token_auth admin_token_auth json_body ec2_extension user_crud_extension public_service
[pipeline:admin_api] [pipeline:admin_api]
pipeline = sizelimit url_normalize build_auth_context token_auth admin_token_auth json_body ec2_extension s3_extension crud_extension admin_service pipeline = url_normalize build_auth_context token_auth admin_token_auth json_body ec2_extension s3_extension crud_extension admin_service
[pipeline:api_v3] [pipeline:api_v3]
pipeline = sizelimit url_normalize build_auth_context token_auth admin_token_auth json_body ec2_extension_v3 s3_extension simple_cert_extension service_v3 pipeline = url_normalize build_auth_context token_auth admin_token_auth json_body ec2_extension_v3 s3_extension simple_cert_extension service_v3
[app:public_version_service] [app:public_version_service]
paste.app_factory = keystone.service:public_version_app_factory paste.app_factory = keystone.service:public_version_app_factory
@ -85,10 +82,10 @@ paste.app_factory = keystone.service:public_version_app_factory
paste.app_factory = keystone.service:admin_version_app_factory paste.app_factory = keystone.service:admin_version_app_factory
[pipeline:public_version_api] [pipeline:public_version_api]
pipeline = sizelimit url_normalize public_version_service pipeline = url_normalize public_version_service
[pipeline:admin_version_api] [pipeline:admin_version_api]
pipeline = sizelimit url_normalize admin_version_service pipeline = url_normalize admin_version_service
[composite:main] [composite:main]
use = egg:Paste#urlmap use = egg:Paste#urlmap

1
swift3/test/functional/conf/keystone.conf.in
View File

@ -1,5 +1,6 @@
[DEFAULT] [DEFAULT]
policy_file=%CONF_DIR%/policy.json policy_file=%CONF_DIR%/policy.json
admin_token = ADMIN
[database] [database]

7
tox.ini
View File

@ -7,10 +7,10 @@ skipsdist = True
whitelist_externals =/bin/bash whitelist_externals =/bin/bash
usedevelop = True usedevelop = True
install_command = pip install {opts} {packages} install_command = pip install {opts} {packages}
# swift 2.7.0 from github
deps = deps =
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
PyECLib==1.0.7 http://tarballs.openstack.org/swift/swift-2.7.0.tar.gz
https://launchpad.net/swift/kilo/2.3.0/+download/swift-2.3.0.tar.gz
commands = nosetests {posargs:swift3/test/unit} commands = nosetests {posargs:swift3/test/unit}
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
NOSE_WITH_OPENSTACK=1 NOSE_WITH_OPENSTACK=1
@ -29,9 +29,10 @@ setenv = AUTH=tempauth
[testenv:keystone] [testenv:keystone]
commands = /bin/bash {posargs:swift3/test/functional/run_test.sh} commands = /bin/bash {posargs:swift3/test/functional/run_test.sh}
setenv = AUTH=keystone setenv = AUTH=keystone
# keystone 9.0.0 from github
deps = deps =
{[testenv]deps} {[testenv]deps}
https://launchpad.net/keystone/kilo/2015.1.0/+download/keystone-2015.1.0.tar.gz http://tarballs.openstack.org/keystone/keystone-9.0.0.tar.gz
[testenv:s3acl] [testenv:s3acl]
commands = /bin/bash {posargs:swift3/test/functional/run_test.sh} commands = /bin/bash {posargs:swift3/test/functional/run_test.sh}