... | ... |
@@ -17,6 +17,7 @@ James E. Blair <james.blair@rackspace.com> |
17 | 17 |
Jason Cannavale <jason.cannavale@rackspace.com> |
18 | 18 |
Jay Pipes <jaypipes@gmail.com> |
19 | 19 |
Jesse Andrews <anotherjesse@gmail.com> |
20 |
+Joe Gordon <jogo@cloudscaling.com> |
|
20 | 21 |
Johannes Erdfelt <johannes.erdfelt@rackspace.com> |
21 | 22 |
John Postlethwait <john.postlethwait@nebula.com> |
22 | 23 |
Josh Kearney <josh@jk0.org> |
... | ... |
@@ -23,8 +23,6 @@ operator_roles = Member,admin |
23 | 23 |
# username and password. |
24 | 24 |
[filter:s3token] |
25 | 25 |
paste.filter_factory = keystone.middleware.s3_token:filter_factory |
26 |
-service_port = %KEYSTONE_SERVICE_PORT% |
|
27 |
-service_host = %KEYSTONE_SERVICE_HOST% |
|
28 | 26 |
auth_port = %KEYSTONE_AUTH_PORT% |
29 | 27 |
auth_host = %KEYSTONE_AUTH_HOST% |
30 | 28 |
auth_protocol = %KEYSTONE_AUTH_PROTOCOL% |
... | ... |
@@ -1445,8 +1445,6 @@ if is_service_enabled swift; then |
1445 | 1445 |
s,%SERVICE_PASSWORD%,$SERVICE_PASSWORD,g; |
1446 | 1446 |
s,%KEYSTONE_SERVICE_PROTOCOL%,$KEYSTONE_SERVICE_PROTOCOL,g; |
1447 | 1447 |
s,%SERVICE_TOKEN%,${SERVICE_TOKEN},g; |
1448 |
- s,%KEYSTONE_SERVICE_PORT%,${KEYSTONE_SERVICE_PORT},g; |
|
1449 |
- s,%KEYSTONE_SERVICE_HOST%,${KEYSTONE_SERVICE_HOST},g; |
|
1450 | 1448 |
s,%KEYSTONE_API_PORT%,${KEYSTONE_API_PORT},g; |
1451 | 1449 |
s,%KEYSTONE_AUTH_HOST%,${KEYSTONE_AUTH_HOST},g; |
1452 | 1450 |
s,%KEYSTONE_AUTH_PORT%,${KEYSTONE_AUTH_PORT},g; |