openstack/murano
Code Issues Proposed changes

Merge "keystoneclient.middleware -> keystonemiddleware"

Browse Source
This commit is contained in:
Jenkins
2014-09-18 13:25:53 +00:00
committed by Gerrit Code Review
parent 074a57f31d dfcd1188f8
commit b9784989b5
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
etc/murano/murano-paste.ini
View File

@@ -7,7 +7,7 @@ paste.filter_factory = murano.api.middleware.context:ContextMiddleware.factory
#For more information see Auth-Token Middleware with Username and Password #For more information see Auth-Token Middleware with Username and Password
#http://docs.openstack.org/developer/keystone/configuringservices.html #http://docs.openstack.org/developer/keystone/configuringservices.html
[filter:authtoken] [filter:authtoken]
paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory paste.filter_factory = keystonemiddleware.auth_token:filter_factory
[composite:rootapp] [composite:rootapp]
use = egg:Paste#urlmap use = egg:Paste#urlmap

2
etc/murano/murano.conf.sample
View File

@@ -536,7 +536,7 @@
[keystone_authtoken] [keystone_authtoken]
# #
# Options defined in keystoneclient.middleware.auth_token # Options defined in keystonemiddleware.auth_token
# #
# Prefix to prepend at the beginning of the path. Deprecated, # Prefix to prepend at the beginning of the path. Deprecated,

1
requirements.txt
View File

@@ -19,6 +19,7 @@ six>=1.7.0
netaddr>=0.7.6 netaddr>=0.7.6
PyYAML>=3.1.0 PyYAML>=3.1.0
jsonpatch>=1.1 jsonpatch>=1.1
keystonemiddleware>=1.0.0
# For paste.util.template used in keystone.common.template # For paste.util.template used in keystone.common.template
Paste Paste

2
tools/config/oslo.config.generator.rc
View File

@@ -1,2 +1,2 @@
export MURANO_CONFIG_GENERATOR_EXTRA_MODULES="keystoneclient.middleware.auth_token" export MURANO_CONFIG_GENERATOR_EXTRA_MODULES="keystonemiddleware.auth_token"
export MURANO_CONFIG_GENERATOR_EXTRA_LIBRARIES="oslo.db oslo.messaging" export MURANO_CONFIG_GENERATOR_EXTRA_LIBRARIES="oslo.db oslo.messaging"