openstack/tripleo-image-elements
Code Issues Proposed changes

Merge "Use nova.conf for auth_token configs."

Browse Source
This commit is contained in:
Jenkins 2013-10-18 14:46:53 +00:00 committed by Gerrit Code Review
commit f2af795ac1
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
elements/nova/os-apply-config/etc/nova/api-paste.ini
View File

@ -106,10 +106,3 @@ paste.filter_factory = nova.api.auth:NovaKeystoneContext.factory
[filter:authtoken]
paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
auth_host = {{keystone.host}}
auth_port = 35357
admin_password = {{nova.service-password}}
auth_protocol = http
admin_tenant_name = service
admin_user = nova
signing_dir = /tmp/keystone-signing-nova

9
elements/nova/os-apply-config/etc/nova/nova.conf
View File

@ -121,3 +121,12 @@ virtual_power_ssh_host={{ssh_host}}
virtual_power_type={{type}}
{{/virtual_power}}
{{/nova.baremetal}}
[keystone_authtoken]
auth_host = {{keystone.host}}
auth_port = 35357
admin_password = {{nova.service-password}}
auth_protocol = http
admin_tenant_name = service
admin_user = nova
signing_dir = /tmp/keystone-signing-nova