openstack
/
openstack-ansible-os_aodh
Code Issues Proposed changes

Merge "Deprecate auth_plugin option" into stable/ocata

This commit is contained in:
Zuul 2017-11-22 14:31:56 +00:00 committed by Gerrit Code Review
parent f034a7efcd ec803649ce
commit bbc83124b4
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@ -85,7 +85,8 @@ aodh_service_description: "Telemetry"
aodh_service_project_domain_id: default
aodh_service_user_domain_id: default
aodh_service_user_name: aodh
aodh_keystone_auth_plugin: password
aodh_keystone_auth_plugin: "{{ aodh_keystone_auth_type }}"
aodh_keystone_auth_type: password
aodh_service_tenant_name: service
aodh_service_project_name: service
aodh_service_publicuri: "{{ aodh_service_proto }}://{{ external_lb_vip_address }}:{{ aodh_service_port }}"

2
templates/aodh.conf.j2
View File

@ -18,7 +18,7 @@ connection = {{ aodh_connection_string }}
[keystone_authtoken]
insecure = {{ keystone_service_internaluri_insecure | bool }}
auth_plugin = {{ aodh_keystone_auth_plugin }}
auth_type = {{ aodh_keystone_auth_plugin }}
auth_url = {{ keystone_service_adminurl }}
auth_uri = {{ keystone_service_internaluri }}
project_domain_id = {{ aodh_service_project_domain_id }}