From fd58f579ae08bfa34bd9e705b5e3e9c80360560d Mon Sep 17 00:00:00 2001 From: Tim Burke Date: Tue, 21 Jul 2015 16:54:52 -0700 Subject: [PATCH] Update version of keystone used for functests Previously, the gate tests used a version of keystone that didn't have a cap on oslo.config. This led to gate checks failing because they pulled in a version of oslo.config that broke backward compatibility. Even if we updated within icehouse, the last oslo.messaging does not include a cap on oslo.utils, which *also* broke backwards compatibility. Now, we'll install the most recently released version of keystone, updating some testing and example config along the way. Change-Id: Id357975413094bab751c5b8549d9201e9232af7f --- README.md | 8 +++++--- etc/proxy-server.conf-sample | 5 +++-- .../test/functional/conf/keystone-paste.ini | 19 +++++-------------- .../test/functional/conf/proxy-server.conf.in | 4 ++-- tox.ini | 2 +- 5 files changed, 16 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 997646cd..c20cc2eb 100644 --- a/README.md +++ b/README.md @@ -56,8 +56,10 @@ If you use keystone: [pipeline:main] pipeline = catch_errors cache swift3 s3token authtoken keystoneauth slo proxy-server -Note that swift3 explicitly checks that keystoneauth is in the pipeline. You must use this name -in the pipeline statement and in [filter:keystoneauth] section header. +Note: + * The s3token and authtoken filters require the keystonemiddleware package. + * Swift3 explicitly checks that keystoneauth is in the pipeline. You must use this name + in the pipeline statement and in [filter:keystoneauth] section header. 3) Add to your proxy-server.conf the section for the Swift3 WSGI filter:: @@ -67,7 +69,7 @@ in the pipeline statement and in [filter:keystoneauth] section header. You also need to add the following if you use keystone (adjust port, host, protocol configurations for your environment): [filter:s3token] - paste.filter_factory = keystoneclient.middleware.s3_token:filter_factory + paste.filter_factory = keystonemiddleware.s3_token:filter_factory auth_port = 35357 auth_host = 127.0.0.1 auth_protocol = http diff --git a/etc/proxy-server.conf-sample b/etc/proxy-server.conf-sample index 4974175e..f57b8bbc 100644 --- a/etc/proxy-server.conf-sample +++ b/etc/proxy-server.conf-sample @@ -5,6 +5,7 @@ # more middleware. # # Keystone pipeline +# Note that s3token and authtoken require the keystonemiddleware package. pipeline = proxy-logging cache swift3 s3token authtoken keystoneauth bulk slo proxy-logging proxy-server # Tempauth pipeline @@ -134,7 +135,7 @@ use = egg:swift#memcache [filter:s3token] # See swift manual for more details. -paste.filter_factory = keystone.middleware.s3_token:filter_factory +paste.filter_factory = keystonemiddleware.s3_token:filter_factory auth_host = keystonehost auth_port = 35357 auth_protocol = http @@ -146,7 +147,7 @@ cache = swift.cache [filter:authtoken] # See swift manual for more details. -paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory +paste.filter_factory = keystonemiddleware.auth_token:filter_factory auth_host = keystonehost auth_port = 35357 auth_protocol = http diff --git a/swift3/test/functional/conf/keystone-paste.ini b/swift3/test/functional/conf/keystone-paste.ini index cd132971..b9515747 100644 --- a/swift3/test/functional/conf/keystone-paste.ini +++ b/swift3/test/functional/conf/keystone-paste.ini @@ -12,15 +12,6 @@ paste.filter_factory = keystone.middleware:TokenAuthMiddleware.factory [filter:admin_token_auth] paste.filter_factory = keystone.middleware:AdminTokenAuthMiddleware.factory -[filter:xml_body] -paste.filter_factory = keystone.middleware:XmlBodyMiddleware.factory - -[filter:xml_body_v2] -paste.filter_factory = keystone.middleware:XmlBodyMiddlewareV2.factory - -[filter:xml_body_v3] -paste.filter_factory = keystone.middleware:XmlBodyMiddlewareV3.factory - [filter:json_body] paste.filter_factory = keystone.middleware:JsonBodyMiddleware.factory @@ -79,13 +70,13 @@ paste.app_factory = keystone.service:v3_app_factory paste.app_factory = keystone.service:admin_app_factory [pipeline:public_api] -pipeline = sizelimit url_normalize build_auth_context token_auth admin_token_auth xml_body_v2 json_body ec2_extension user_crud_extension public_service +pipeline = sizelimit url_normalize build_auth_context token_auth admin_token_auth json_body ec2_extension user_crud_extension public_service [pipeline:admin_api] -pipeline = sizelimit url_normalize build_auth_context token_auth admin_token_auth xml_body_v2 json_body ec2_extension s3_extension crud_extension admin_service +pipeline = sizelimit url_normalize build_auth_context token_auth admin_token_auth json_body ec2_extension s3_extension crud_extension admin_service [pipeline:api_v3] -pipeline = sizelimit url_normalize build_auth_context token_auth admin_token_auth xml_body_v3 json_body ec2_extension_v3 s3_extension simple_cert_extension service_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 [app:public_version_service] paste.app_factory = keystone.service:public_version_app_factory @@ -94,10 +85,10 @@ paste.app_factory = keystone.service:public_version_app_factory paste.app_factory = keystone.service:admin_version_app_factory [pipeline:public_version_api] -pipeline = sizelimit url_normalize xml_body public_version_service +pipeline = sizelimit url_normalize public_version_service [pipeline:admin_version_api] -pipeline = sizelimit url_normalize xml_body admin_version_service +pipeline = sizelimit url_normalize admin_version_service [composite:main] use = egg:Paste#urlmap diff --git a/swift3/test/functional/conf/proxy-server.conf.in b/swift3/test/functional/conf/proxy-server.conf.in index cfe89b3f..2469084c 100644 --- a/swift3/test/functional/conf/proxy-server.conf.in +++ b/swift3/test/functional/conf/proxy-server.conf.in @@ -44,7 +44,7 @@ use = egg:swift#dlo use = egg:swift#memcache [filter:s3token] -paste.filter_factory = keystone.middleware.s3_token:filter_factory +paste.filter_factory = keystonemiddleware.s3_token:filter_factory auth_host = localhost auth_port = 35357 auth_protocol = http @@ -55,7 +55,7 @@ admin_password = password cache = swift.cache [filter:authtoken] -paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory +paste.filter_factory = keystonemiddleware.auth_token:filter_factory auth_host = localhost auth_port = 35357 auth_protocol = http diff --git a/tox.ini b/tox.ini index 484904e6..fce5400a 100644 --- a/tox.ini +++ b/tox.ini @@ -30,7 +30,7 @@ commands = /bin/bash {posargs:swift3/test/functional/run_test.sh} setenv = AUTH=keystone deps = {[testenv]deps} - https://launchpad.net/keystone/icehouse/2014.1.1/+download/keystone-2014.1.1.tar.gz + https://launchpad.net/keystone/kilo/2015.1.0/+download/keystone-2015.1.0.tar.gz [testenv:s3acl] commands = /bin/bash {posargs:swift3/test/functional/run_test.sh}