openstack/openstack-ansible
Code Issues Proposed changes

Merge "Revert heat's keystone_authtoken configuration"

Browse Source
This commit is contained in:
Jenkins 2015-04-20 19:00:59 +00:00 committed by Gerrit Code Review
commit 67d6361a1c
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
playbooks/roles/os_heat/templates/heat.conf.j2
View File

@ -38,7 +38,7 @@ endpoint_type = {{ heat_clients_heat_endpoint }}
connection = mysql://{{ heat_galera_user }}:{{ heat_container_mysql_password }}@{{ galera_address }}/{{ heat_galera_database }}?charset=utf8 connection = mysql://{{ heat_galera_user }}:{{ heat_container_mysql_password }}@{{ galera_address }}/{{ heat_galera_database }}?charset=utf8
[ec2authtoken] [ec2authtoken]
auth_uri = {{ keystone_service_internaluri }} auth_uri = {{ keystone_service_internalurl }}
[heat_api] [heat_api]
bind_port = {{ heat_service_port }} bind_port = {{ heat_service_port }}
@ -63,15 +63,12 @@ trace_sqlalchemy = {{ heat_profiler_trace_sqlalchemy }}
[keystone_authtoken] [keystone_authtoken]
auth_plugin = {{ heat_keystone_auth_plugin }}
signing_dir = /var/cache/heat signing_dir = /var/cache/heat
auth_url = {{ keystone_service_adminuri }} identity_uri = {{ keystone_service_adminuri }}
auth_uri = {{ keystone_service_internaluri }} auth_uri = {{ keystone_service_internalurl }}
project_domain_id = {{ heat_service_project_domain_id }} admin_tenant_name = {{ heat_service_project_name }}
user_domain_id = {{ heat_service_user_domain_id }} admin_user = {{ heat_service_user_name }}
project_name = {{ heat_service_project_name }} admin_password = {{ heat_service_password }}
username = {{ heat_service_user_name }}
password = {{ heat_service_password }}
memcached_servers = {{ memcached_servers }} memcached_servers = {{ memcached_servers }}