openstack/openstack-ansible
Code Issues Proposed changes

Merge "Update keystone middleware in heat for Kilo"

Browse Source
This commit is contained in:
Jenkins 2015-04-16 11:00:38 +00:00 committed by Gerrit Code Review
commit 7adc9fb852
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
playbooks/roles/os_heat/defaults/main.yml
View File

@ -64,8 +64,13 @@ heat_profiler_enabled: false
heat_profiler_trace_sqlalchemy: false heat_profiler_trace_sqlalchemy: false
## Auth ## Auth
heat_service_tenant_name: "service" heat_service_project_name: "service"
heat_service_user_name: "heat" heat_service_user_name: "heat"
heat_service_project_domain_id: "default"
heat_service_user_domain_id: "default"
## Keystone authentication middleware
heat_keystone_auth_plugin: password
## Heat api service type and data ## Heat api service type and data
heat_service_name: heat heat_service_name: heat

6
playbooks/roles/os_heat/tasks/heat_service_setup.yml
View File

@ -16,7 +16,7 @@
- include: heat_service_add.yml - include: heat_service_add.yml
vars: vars:
service_user_name: "{{ heat_service_user_name }}" service_user_name: "{{ heat_service_user_name }}"
service_tenant_name: "{{ heat_service_tenant_name }}" service_tenant_name: "{{ heat_service_project_name }}"
service_name: "{{ heat_service_name }}" service_name: "{{ heat_service_name }}"
service_type: "{{ heat_service_type }}" service_type: "{{ heat_service_type }}"
service_region: "{{ heat_service_region }}" service_region: "{{ heat_service_region }}"
@ -32,7 +32,7 @@
- include: heat_service_add.yml - include: heat_service_add.yml
vars: vars:
service_user_name: "{{ heat_service_user_name }}" service_user_name: "{{ heat_service_user_name }}"
service_tenant_name: "{{ heat_service_tenant_name }}" service_tenant_name: "{{ heat_service_project_name }}"
service_name: "{{ heat_cfn_service_name }}" service_name: "{{ heat_cfn_service_name }}"
service_type: "{{ heat_cfn_service_type }}" service_type: "{{ heat_cfn_service_type }}"
service_region: "{{ heat_service_region }}" service_region: "{{ heat_service_region }}"
@ -54,7 +54,7 @@
token: "{{ keystone_auth_admin_token }}" token: "{{ keystone_auth_admin_token }}"
endpoint: "{{ keystone_service_adminurl }}" endpoint: "{{ keystone_service_adminurl }}"
user_name: "{{ heat_service_user_name }}" user_name: "{{ heat_service_user_name }}"
tenant_name: "{{ heat_service_tenant_name }}" tenant_name: "{{ heat_service_project_name }}"
role_name: "{{ heat_stack_owner_name }}" role_name: "{{ heat_stack_owner_name }}"
register: add_service register: add_service
until: add_service|success until: add_service|success

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_internalurl }} auth_uri = {{ keystone_service_internaluri }}
[heat_api] [heat_api]
bind_port = {{ heat_service_port }} bind_port = {{ heat_service_port }}
@ -63,12 +63,15 @@ 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
identity_uri = {{ keystone_service_adminuri }} auth_url = {{ keystone_service_adminuri }}
auth_uri = {{ keystone_service_internalurl }} auth_uri = {{ keystone_service_internaluri }}
admin_tenant_name = {{ heat_service_tenant_name }} project_domain_id = {{ heat_service_project_domain_id }}
admin_user = {{ heat_service_user_name }} user_domain_id = {{ heat_service_user_domain_id }}
admin_password = {{ heat_service_password }} project_name = {{ heat_service_project_name }}
username = {{ heat_service_user_name }}
password = {{ heat_service_password }}
memcached_servers = {{ memcached_servers }} memcached_servers = {{ memcached_servers }}