openstack/openstack-ansible
Code Issues Proposed changes

Changed ceilometer configs to use keystonev3

Browse Source 
Also added region_name.

Change-Id: Ie45cbd6fb189c1d7923a1f3f50c97c679a6bbe16
Closes-Bug: #1540589
This commit is contained in:
Miguel Alex Cantu 2016-02-01 21:54:22 +00:00 committed by Miguel Alex Cantu (alextricity25)
parent e1055b49c6
commit 4e1ec7d643
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
playbooks/roles/os_ceilometer/templates/ceilometer.conf.j2
View File

@ -77,7 +77,6 @@ alarm_connection = {{ aodh_connection_string }}
[keystone_authtoken] [keystone_authtoken]
insecure = {{ keystone_service_internaluri_insecure | bool }} insecure = {{ keystone_service_internaluri_insecure | bool }}
signing_dir = /var/cache/ceilometer signing_dir = /var/cache/ceilometer
identity_uri = {{ keystone_service_adminuri }}
auth_uri = {{ keystone_service_internaluri }} auth_uri = {{ keystone_service_internaluri }}
auth_url = {{ keystone_service_adminuri }} auth_url = {{ keystone_service_adminuri }}
auth_plugin = {{ ceilometer_keystone_auth_plugin }} auth_plugin = {{ ceilometer_keystone_auth_plugin }}
@ -86,6 +85,7 @@ user_domain_id = {{ ceilometer_service_user_domain_id }}
project_name = {{ ceilometer_service_project_name }} project_name = {{ ceilometer_service_project_name }}
username = {{ ceilometer_service_user_name }} username = {{ ceilometer_service_user_name }}
password = {{ ceilometer_service_password }} password = {{ ceilometer_service_password }}
region_name = {{ ceilometer_service_region }}
memcached_servers = {{ memcached_servers }} memcached_servers = {{ memcached_servers }}
@ -99,8 +99,12 @@ memcache_secret_key = {{ memcached_encryption_key }}
telemetry_secret = {{ ceilometer_telemetry_secret }} telemetry_secret = {{ ceilometer_telemetry_secret }}
[service_credentials] [service_credentials]
#TODO: Keystone v2 API is being used until https://review.openstack.org/#/c/237537/ merges. insecure = {{ keystone_service_internaluri_insecure | bool }}
os_auth_url = {{ keystone_service_internaluri }}/v2.0 auth_url = {{ keystone_service_adminuri }}
os_username = {{ ceilometer_service_user_name }} auth_plugin = {{ ceilometer_keystone_auth_plugin }}
os_tenant_name = {{ ceilometer_service_tenant_name }} project_domain_id = {{ ceilometer_service_project_domain_id }}
os_password = {{ ceilometer_service_password }} user_domain_id = {{ ceilometer_service_user_domain_id }}
project_name = {{ ceilometer_service_project_name }}
username = {{ ceilometer_service_user_name }}
password = {{ ceilometer_service_password }}
region_name = {{ ceilometer_service_region }}

7
releasenotes/notes/ceilometer-keystone-v3-4cc85b056e2491b2.yaml Normal file
View File

@ -0,0 +1,7 @@
---
features:
- Ceilometer now uses the Keystone v3 endpoint.
The 'identity_uri' directive has been removed since
it's unused. 'region_name' has been added.
The directives under 'service_credentials' have been
updated to support the keystoneauth library