Merge "Deprecate auth_plugin option" into stable/ocata

This commit is contained in:
Zuul 2018-02-22 05:39:46 +00:00 committed by Gerrit Code Review
commit 79b9b9593e
2 changed files with 4 additions and 3 deletions

View File

@ -135,7 +135,8 @@ ceilometer_disk_source_sample_interval: "{{ ceilometer_sample_interval }}"
ceilometer_network_source_sample_interval: "{{ ceilometer_sample_interval }}"
## Keystone authentication middleware
ceilometer_keystone_auth_plugin: password
ceilometer_keystone_auth_plugin: "{{ ceilometer_keystone_auth_type }}"
ceilometer_keystone_auth_type: password
# ceilometer packages that must be installed before anything else
ceilometer_requires_pip_packages:

View File

@ -129,7 +129,7 @@ max_retries = 80
insecure = {{ keystone_service_internaluri_insecure | bool }}
auth_uri = {{ keystone_service_internaluri }}
auth_url = {{ keystone_service_adminuri }}
auth_plugin = {{ ceilometer_keystone_auth_plugin }}
auth_type = {{ ceilometer_keystone_auth_plugin }}
project_domain_id = {{ ceilometer_service_project_domain_id }}
user_domain_id = {{ ceilometer_service_user_domain_id }}
project_name = {{ ceilometer_service_project_name }}
@ -150,7 +150,7 @@ telemetry_secret = {{ ceilometer_telemetry_secret }}
[service_credentials]
insecure = {{ keystone_service_internaluri_insecure | bool }}
auth_url = {{ keystone_service_adminurl }}
auth_plugin = {{ ceilometer_keystone_auth_plugin }}
auth_type = {{ ceilometer_keystone_auth_plugin }}
project_domain_id = {{ ceilometer_service_project_domain_id }}
user_domain_id = {{ ceilometer_service_user_domain_id }}
project_name = {{ ceilometer_service_project_name }}