openstack/heat
Code Issues Proposed changes

Move heat-api auth_token conf from paste.ini

Browse Source 
keystone auth_token middleware now allows heat to have auth_token
configuration in heat-api.conf. Moves the example of
auth_token configuration from heat-api-paste.ini to heat-api.conf.
This simplifies user configuations and users is no longer required
to edit heat-api-paste.ini.

This does not break backward compatibility. auth_token first
tries the configurations in /etc/heat/heat-api-paste.ini and then the
above configurations. Thus a user who already uses heat-api-paste.ini
does not need to change it.

Change-Id: Ia0a4d912cd7380094e121ee4af733277ca4d812e
Blueprint: keystone-middleware
This commit is contained in:
Steve Baker 2013-04-03 12:29:50 +13:00
parent cfda18b43e
commit 419a3d953e
6 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etc/heat/heat-api-cfn-paste.ini
View File

@ -29,13 +29,3 @@ keystone_ec2_uri = http://localhost:5000/v2.0/ec2tokens
[filter:authtoken] [filter:authtoken]
paste.filter_factory = heat.common.auth_token:filter_factory paste.filter_factory = heat.common.auth_token:filter_factory
auth_host = 127.0.0.1
auth_port = 35357
auth_protocol = http
auth_uri = http://127.0.0.1:5000/v2.0
# These must be set to your local values in order for the token
# authentication to work.
admin_tenant_name = service
admin_user = heat
admin_password = verybadpass

12
etc/heat/heat-api-cfn.conf
View File

@ -28,3 +28,15 @@ use_syslog = False
# syslog_log_facility = LOG_LOCAL0 # syslog_log_facility = LOG_LOCAL0
rpc_backend=heat.openstack.common.rpc.impl_qpid rpc_backend=heat.openstack.common.rpc.impl_qpid
[keystone_authtoken]
auth_host = 127.0.0.1
auth_port = 35357
auth_protocol = http
auth_uri = http://127.0.0.1:5000/v2.0
# These must be set to your local values in order for the token
# authentication to work.
admin_tenant_name = service
admin_user = heat
admin_password = verybadpass

10
etc/heat/heat-api-cloudwatch-paste.ini
View File

@ -29,13 +29,3 @@ keystone_ec2_uri = http://localhost:5000/v2.0/ec2tokens
[filter:authtoken] [filter:authtoken]
paste.filter_factory = heat.common.auth_token:filter_factory paste.filter_factory = heat.common.auth_token:filter_factory
auth_host = 127.0.0.1
auth_port = 35357
auth_protocol = http
auth_uri = http://127.0.0.1:5000/v2.0
# These must be set to your local values in order for the token
# authentication to work.
admin_tenant_name = service
admin_user = heat
admin_password = verybadpass

12
etc/heat/heat-api-cloudwatch.conf
View File

@ -26,3 +26,15 @@ bind_host = 0.0.0.0
bind_port = 8003 bind_port = 8003
rpc_backend=heat.openstack.common.rpc.impl_qpid rpc_backend=heat.openstack.common.rpc.impl_qpid
[keystone_authtoken]
auth_host = 127.0.0.1
auth_port = 35357
auth_protocol = http
auth_uri = http://127.0.0.1:5000/v2.0
# These must be set to your local values in order for the token
# authentication to work.
admin_tenant_name = service
admin_user = heat
admin_password = verybadpass

10
etc/heat/heat-api-paste.ini
View File

@ -32,16 +32,6 @@ paste.filter_factory = heat.common.context:ContextMiddleware_filter_factory
[filter:authtoken] [filter:authtoken]
paste.filter_factory = heat.common.auth_token:filter_factory paste.filter_factory = heat.common.auth_token:filter_factory
auth_host = 127.0.0.1
auth_port = 35357
auth_protocol = http
auth_uri = http://127.0.0.1:5000/v2.0
# These must be set to your local values in order for the token
# authentication to work.
admin_tenant_name = service
admin_user = heat
admin_password = verybadpass
[filter:custombackendauth] [filter:custombackendauth]
paste.filter_factory = heat.common.custom_backend_auth:filter_factory paste.filter_factory = heat.common.custom_backend_auth:filter_factory

12
etc/heat/heat-api.conf
View File

@ -32,3 +32,15 @@ rpc_backend=heat.openstack.common.rpc.impl_qpid
# Uncomment this if you're using a custom cloud backend: # Uncomment this if you're using a custom cloud backend:
# [paste_deploy] # [paste_deploy]
# flavor = custombackend # flavor = custombackend
[keystone_authtoken]
auth_host = 127.0.0.1
auth_port = 35357
auth_protocol = http
auth_uri = http://127.0.0.1:5000/v2.0
# These must be set to your local values in order for the token
# authentication to work.
admin_tenant_name = service
admin_user = heat
admin_password = verybadpass