Merge "Deprecate auth_plugin option" into stable/ocata
This commit is contained in:
commit
bbc83124b4
|
@ -85,7 +85,8 @@ aodh_service_description: "Telemetry"
|
||||||
aodh_service_project_domain_id: default
|
aodh_service_project_domain_id: default
|
||||||
aodh_service_user_domain_id: default
|
aodh_service_user_domain_id: default
|
||||||
aodh_service_user_name: aodh
|
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_tenant_name: service
|
||||||
aodh_service_project_name: service
|
aodh_service_project_name: service
|
||||||
aodh_service_publicuri: "{{ aodh_service_proto }}://{{ external_lb_vip_address }}:{{ aodh_service_port }}"
|
aodh_service_publicuri: "{{ aodh_service_proto }}://{{ external_lb_vip_address }}:{{ aodh_service_port }}"
|
||||||
|
|
|
@ -18,7 +18,7 @@ connection = {{ aodh_connection_string }}
|
||||||
|
|
||||||
[keystone_authtoken]
|
[keystone_authtoken]
|
||||||
insecure = {{ keystone_service_internaluri_insecure | bool }}
|
insecure = {{ keystone_service_internaluri_insecure | bool }}
|
||||||
auth_plugin = {{ aodh_keystone_auth_plugin }}
|
auth_type = {{ aodh_keystone_auth_plugin }}
|
||||||
auth_url = {{ keystone_service_adminurl }}
|
auth_url = {{ keystone_service_adminurl }}
|
||||||
auth_uri = {{ keystone_service_internaluri }}
|
auth_uri = {{ keystone_service_internaluri }}
|
||||||
project_domain_id = {{ aodh_service_project_domain_id }}
|
project_domain_id = {{ aodh_service_project_domain_id }}
|
||||||
|
|
Loading…
Reference in New Issue