openstack/devstack
Code Issues Proposed changes

Merge "Remove service_ and admin_token."

Browse Source
This commit is contained in:
Jenkins 2012-03-20 07:47:32 +00:00 committed by Gerrit Code Review
commit bd07d61c45
4 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files/glance-api-paste.ini
View File

@ -30,10 +30,6 @@ glance.filter_factory = glance.common.context:ContextMiddleware
[filter:authtoken] [filter:authtoken]
paste.filter_factory = keystone.middleware.auth_token:filter_factory paste.filter_factory = keystone.middleware.auth_token:filter_factory
# FIXME(dtroyer): remove these service_* entries after auth_token is updated
service_host = %KEYSTONE_SERVICE_HOST%
service_port = %KEYSTONE_SERVICE_PORT%
service_protocol = %KEYSTONE_SERVICE_PROTOCOL%
auth_host = %KEYSTONE_AUTH_HOST% auth_host = %KEYSTONE_AUTH_HOST%
auth_port = %KEYSTONE_AUTH_PORT% auth_port = %KEYSTONE_AUTH_PORT%
auth_protocol = %KEYSTONE_AUTH_PROTOCOL% auth_protocol = %KEYSTONE_AUTH_PROTOCOL%

4
files/glance-registry-paste.ini
View File

@ -14,10 +14,6 @@ glance.filter_factory = glance.common.context:ContextMiddleware
[filter:authtoken] [filter:authtoken]
paste.filter_factory = keystone.middleware.auth_token:filter_factory paste.filter_factory = keystone.middleware.auth_token:filter_factory
# FIXME(dtroyer): remove these service_* entries after auth_token is updated
service_host = %KEYSTONE_SERVICE_HOST%
service_port = %KEYSTONE_SERVICE_PORT%
service_protocol = %KEYSTONE_SERVICE_PROTOCOL%
auth_host = %KEYSTONE_AUTH_HOST% auth_host = %KEYSTONE_AUTH_HOST%
auth_port = %KEYSTONE_AUTH_PORT% auth_port = %KEYSTONE_AUTH_PORT%
auth_protocol = %KEYSTONE_AUTH_PROTOCOL% auth_protocol = %KEYSTONE_AUTH_PROTOCOL%

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

@ -19,6 +19,8 @@ account_autocreate = true
paste.filter_factory = keystone.middleware.swift_auth:filter_factory paste.filter_factory = keystone.middleware.swift_auth:filter_factory
operator_roles = Member,admin operator_roles = Member,admin
# NOTE(chmou): s3token middleware is not updated yet to use only
# 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_port = %KEYSTONE_SERVICE_PORT%
@ -29,21 +31,15 @@ auth_protocol = %KEYSTONE_AUTH_PROTOCOL%
auth_token = %SERVICE_TOKEN% auth_token = %SERVICE_TOKEN%
admin_token = %SERVICE_TOKEN% admin_token = %SERVICE_TOKEN%
[filter:tokenauth] [filter:authtoken]
paste.filter_factory = keystone.middleware.auth_token:filter_factory paste.filter_factory = keystone.middleware.auth_token:filter_factory
# FIXME(dtroyer): remove these service_* entries after auth_token is updated
service_port = %KEYSTONE_SERVICE_PORT%
service_host = %KEYSTONE_SERVICE_HOST%
auth_port = %KEYSTONE_AUTH_PORT%
auth_host = %KEYSTONE_AUTH_HOST% auth_host = %KEYSTONE_AUTH_HOST%
auth_port = %KEYSTONE_AUTH_PORT%
auth_protocol = %KEYSTONE_AUTH_PROTOCOL% auth_protocol = %KEYSTONE_AUTH_PROTOCOL%
auth_token = %SERVICE_TOKEN% auth_uri = %KEYSTONE_SERVICE_PROTOCOL%://%KEYSTONE_SERVICE_HOST%:%KEYSTONE_SERVICE_PORT%/
# FIXME(dtroyer): remove admin_token after auth_token is updated
admin_token = %SERVICE_TOKEN%
admin_tenant_name = %SERVICE_TENANT_NAME% admin_tenant_name = %SERVICE_TENANT_NAME%
admin_user = %SERVICE_USERNAME% admin_user = %SERVICE_USERNAME%
admin_password = %SERVICE_PASSWORD% admin_password = %SERVICE_PASSWORD%
cache = swift.cache
[filter:swift3] [filter:swift3]
use = egg:swift#swift3 use = egg:swift#swift3

3
stack.sh
View File

@ -1078,7 +1078,7 @@ if is_service_enabled swift; then
# which has some default username and password if you have # which has some default username and password if you have
# configured keystone it will checkout the directory. # configured keystone it will checkout the directory.
if is_service_enabled key; then if is_service_enabled key; then
swift_auth_server="s3token tokenauth keystone" swift_auth_server="s3token authtoken keystone"
else else
swift_auth_server=tempauth swift_auth_server=tempauth
fi fi
@ -1091,6 +1091,7 @@ if is_service_enabled swift; then
s,%SERVICE_TENANT_NAME%,$SERVICE_TENANT_NAME,g; s,%SERVICE_TENANT_NAME%,$SERVICE_TENANT_NAME,g;
s,%SERVICE_USERNAME%,swift,g; s,%SERVICE_USERNAME%,swift,g;
s,%SERVICE_PASSWORD%,$SERVICE_PASSWORD,g; s,%SERVICE_PASSWORD%,$SERVICE_PASSWORD,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_PORT%,${KEYSTONE_SERVICE_PORT},g;
s,%KEYSTONE_SERVICE_HOST%,${KEYSTONE_SERVICE_HOST},g; s,%KEYSTONE_SERVICE_HOST%,${KEYSTONE_SERVICE_HOST},g;