openstack/barbican
Code Issues Proposed changes

Revert backwards incompatible paste change

Browse Source 
A breaking change to the paste.ini was introduced in git commit
3b20d84312 where the main app was
renamed from "apiapp" to "apiapp_v1".

This was an unnecessary change that would force deployers to rewrite
their configuration files, which may include changes to configuration
management systems.

This change reverts the incompatible name change so that operators are
able to upgrade from Kilo to Liberty witouth having to rewrite their
paste file.

Change-Id: If3dc7060ae5ea6d427c3a1e9989fa1e17a469db7
This commit is contained in:
Douglas Mendizábal 2015-07-28 16:32:00 -05:00
parent f113520694
commit 83d36f4641
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
barbican/api/app.py
View File

@ -86,7 +86,7 @@ def main_app(func):
@main_app @main_app
def create_main_app_v1(global_config, **local_conf): def create_main_app(global_config, **local_conf):
"""uWSGI factory method for the Barbican-API application.""" """uWSGI factory method for the Barbican-API application."""
# Setup app with transactional hook enabled # Setup app with transactional hook enabled
return build_wsgi_app(versions.V1Controller(), transactional=True) return build_wsgi_app(versions.V1Controller(), transactional=True)

2
contrib/devstack/lib/barbican
View File

@ -155,7 +155,7 @@ function configure_barbican {
## Set up keystone ## Set up keystone
# Turn on the middleware # Turn on the middleware
iniset $BARBICAN_PASTE_CONF 'pipeline:barbican_api' pipeline 'keystone_authtoken context apiapp_v1' iniset $BARBICAN_PASTE_CONF 'pipeline:barbican_api' pipeline 'keystone_authtoken context apiapp'
# Set the keystone parameters # Set the keystone parameters
iniset $BARBICAN_PASTE_CONF 'filter:keystone_authtoken' auth_protocol $KEYSTONE_AUTH_PROTOCOL iniset $BARBICAN_PASTE_CONF 'filter:keystone_authtoken' auth_protocol $KEYSTONE_AUTH_PROTOCOL

2
doc/source/setup/keystone.rst
View File

@ -32,7 +32,7 @@ the get version call.
.. code-block:: ini .. code-block:: ini
[pipeline:barbican_api] [pipeline:barbican_api]
pipeline = keystone_authtoken context apiapp_v1 pipeline = keystone_authtoken context apiapp
2. Replace ``keystone_authtoken`` filter values to match your Keystone 2. Replace ``keystone_authtoken`` filter values to match your Keystone
setup setup

12
etc/barbican/barbican-api-paste.ini
View File

@ -9,20 +9,20 @@ pipeline = versionapp
# Use this pipeline for Barbican API - DEFAULT no authentication # Use this pipeline for Barbican API - DEFAULT no authentication
[pipeline:barbican_api] [pipeline:barbican_api]
pipeline = unauthenticated-context apiapp_v1 pipeline = unauthenticated-context apiapp
#pipeline = keystone_authtoken context apiapp_v1 #pipeline = keystone_authtoken context apiapp
#Use this pipeline to activate a repoze.profile middleware and HTTP port, #Use this pipeline to activate a repoze.profile middleware and HTTP port,
# to provide profiling information for the REST API processing. # to provide profiling information for the REST API processing.
[pipeline:barbican-profile] [pipeline:barbican-profile]
pipeline = unauthenticated-context egg:Paste#cgitb egg:Paste#httpexceptions profile apiapp_v1 pipeline = unauthenticated-context egg:Paste#cgitb egg:Paste#httpexceptions profile apiapp
#Use this pipeline for keystone auth #Use this pipeline for keystone auth
[pipeline:barbican-api-keystone] [pipeline:barbican-api-keystone]
pipeline = keystone_authtoken context apiapp_v1 pipeline = keystone_authtoken context apiapp
[app:apiapp_v1] [app:apiapp]
paste.app_factory = barbican.api.app:create_main_app_v1 paste.app_factory = barbican.api.app:create_main_app
[app:versionapp] [app:versionapp]
paste.app_factory = barbican.api.app:create_version_app paste.app_factory = barbican.api.app:create_version_app