openstack/devstack
Code Issues Proposed changes

Merge "Remove unused service_* from authtoken middleware"

Browse Source
This commit is contained in:
Jenkins 2012-05-24 17:53:44 +00:00 committed by Gerrit Code Review
commit 484cf92b40
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -17,6 +17,7 @@ James E. Blair <james.blair@rackspace.com>
Jason Cannavale <jason.cannavale@rackspace.com> Jason Cannavale <jason.cannavale@rackspace.com>
Jay Pipes <jaypipes@gmail.com> Jay Pipes <jaypipes@gmail.com>
Jesse Andrews <anotherjesse@gmail.com> Jesse Andrews <anotherjesse@gmail.com>
Joe Gordon <jogo@cloudscaling.com>
Johannes Erdfelt <johannes.erdfelt@rackspace.com> Johannes Erdfelt <johannes.erdfelt@rackspace.com>
John Postlethwait <john.postlethwait@nebula.com> John Postlethwait <john.postlethwait@nebula.com>
Josh Kearney <josh@jk0.org> Josh Kearney <josh@jk0.org>

2
files/swift/proxy-server.conf
View File

@ -23,8 +23,6 @@ operator_roles = Member,admin
# username and password. # username and password.
[filter:s3token] [filter:s3token]
paste.filter_factory = keystone.middleware.s3_token:filter_factory paste.filter_factory = keystone.middleware.s3_token:filter_factory
service_port = %KEYSTONE_SERVICE_PORT%
service_host = %KEYSTONE_SERVICE_HOST%
auth_port = %KEYSTONE_AUTH_PORT% auth_port = %KEYSTONE_AUTH_PORT%
auth_host = %KEYSTONE_AUTH_HOST% auth_host = %KEYSTONE_AUTH_HOST%
auth_protocol = %KEYSTONE_AUTH_PROTOCOL% auth_protocol = %KEYSTONE_AUTH_PROTOCOL%

2
stack.sh
View File

@ -1445,8 +1445,6 @@ if is_service_enabled swift; then
s,%SERVICE_PASSWORD%,$SERVICE_PASSWORD,g; s,%SERVICE_PASSWORD%,$SERVICE_PASSWORD,g;
s,%KEYSTONE_SERVICE_PROTOCOL%,$KEYSTONE_SERVICE_PROTOCOL,g; s,%KEYSTONE_SERVICE_PROTOCOL%,$KEYSTONE_SERVICE_PROTOCOL,g;
s,%SERVICE_TOKEN%,${SERVICE_TOKEN},g; s,%SERVICE_TOKEN%,${SERVICE_TOKEN},g;
s,%KEYSTONE_SERVICE_PORT%,${KEYSTONE_SERVICE_PORT},g;
s,%KEYSTONE_SERVICE_HOST%,${KEYSTONE_SERVICE_HOST},g;
s,%KEYSTONE_API_PORT%,${KEYSTONE_API_PORT},g; s,%KEYSTONE_API_PORT%,${KEYSTONE_API_PORT},g;
s,%KEYSTONE_AUTH_HOST%,${KEYSTONE_AUTH_HOST},g; s,%KEYSTONE_AUTH_HOST%,${KEYSTONE_AUTH_HOST},g;
s,%KEYSTONE_AUTH_PORT%,${KEYSTONE_AUTH_PORT},g; s,%KEYSTONE_AUTH_PORT%,${KEYSTONE_AUTH_PORT},g;