openstack
/
openstack-ansible-os_ceilometer
Code Issues Proposed changes

Deprecate auth_plugin option 

Option "auth_plugin" is deprecated, use option "auth_type" instead.

Change-Id: I0da3415ada2c17d8faa78ff4ed9e50353b6915ef
Implements: blueprint deprecate-auth-plugin
(cherry picked from commit 3ec93b9c3d)
This commit is contained in:
ZhongShengping 2017-03-22 11:03:22 +08:00 committed by Jesse Pretorius (odyssey4me)
parent d05156c5e7
commit 1bab76d9db
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
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:

4
templates/ceilometer.conf.j2
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 }}