From dfcd1188f87052f45550b69e80b6a9ba6274f424 Mon Sep 17 00:00:00 2001 From: Stan Lagun Date: Wed, 17 Sep 2014 04:51:26 +0400 Subject: [PATCH] keystoneclient.middleware -> keystonemiddleware Switch from keystoneclient.middleware.auth_token to keystonemiddleware.auth_token Change-Id: Ifd72477dcdbe5e4c5da55a413c4d0c4be625632e --- etc/murano/murano-paste.ini | 2 +- etc/murano/murano.conf.sample | 2 +- requirements.txt | 1 + tools/config/oslo.config.generator.rc | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/etc/murano/murano-paste.ini b/etc/murano/murano-paste.ini index a820f93e4..3ad448eb3 100644 --- a/etc/murano/murano-paste.ini +++ b/etc/murano/murano-paste.ini @@ -7,7 +7,7 @@ paste.filter_factory = murano.api.middleware.context:ContextMiddleware.factory #For more information see Auth-Token Middleware with Username and Password #http://docs.openstack.org/developer/keystone/configuringservices.html [filter:authtoken] -paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory +paste.filter_factory = keystonemiddleware.auth_token:filter_factory [composite:rootapp] use = egg:Paste#urlmap diff --git a/etc/murano/murano.conf.sample b/etc/murano/murano.conf.sample index 54209feed..a4a25594a 100644 --- a/etc/murano/murano.conf.sample +++ b/etc/murano/murano.conf.sample @@ -536,7 +536,7 @@ [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, diff --git a/requirements.txt b/requirements.txt index 18b9690da..3b64a2c43 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,6 +19,7 @@ six>=1.7.0 netaddr>=0.7.6 PyYAML>=3.1.0 jsonpatch>=1.1 +keystonemiddleware>=1.0.0 # For paste.util.template used in keystone.common.template Paste diff --git a/tools/config/oslo.config.generator.rc b/tools/config/oslo.config.generator.rc index f2e629c87..428431841 100644 --- a/tools/config/oslo.config.generator.rc +++ b/tools/config/oslo.config.generator.rc @@ -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"