From 69cda59569d54053ca5e500077599ff1ea7e3221 Mon Sep 17 00:00:00 2001 From: yanhcdl Date: Thu, 13 Feb 2014 18:02:34 +0800 Subject: [PATCH] Change authtoken to keystoneclient.middleware.auth_token:filter_factory Add authurl before authtoken in the heat-api pipeline And change filter:authtoken to: [filter:authtoken] paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory Further information please refer to related bug. Related-Bug: #1259364 Change-Id: If71772a84f783e7ebe662d7d6338e86d8dcb9812 --- templates/default/api-paste.ini.erb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/templates/default/api-paste.ini.erb b/templates/default/api-paste.ini.erb index 3e90938..9df7365 100644 --- a/templates/default/api-paste.ini.erb +++ b/templates/default/api-paste.ini.erb @@ -2,7 +2,7 @@ # heat-api pipeline [pipeline:heat-api] -pipeline = faultwrap versionnegotiation authtoken context apiv1app +pipeline = faultwrap versionnegotiation authurl authtoken context apiv1app # heat-api pipeline for standalone heat # ie. uses alternative auth backend that authenticates users against keystone @@ -75,9 +75,13 @@ paste.filter_factory = heat.common.context:ContextMiddleware_filter_factory [filter:ec2authtoken] paste.filter_factory = heat.api.aws.ec2token:EC2Token_filter_factory +# Middleware to set auth_url header appropriately +[filter:authurl] +paste.filter_factory = heat.common.auth_url:filter_factory + # Auth middleware that validates token against keystone [filter:authtoken] -paste.filter_factory = heat.common.auth_token:filter_factory +paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory # Auth middleware that validates username/password against keystone [filter:authpassword]