openstack/kolla-ansible
Code Issues Proposed changes

Remove keystone_authtoken section for ceilometer

Browse Source 
Now, the ceilometer use [service_credentials] to get credentials[0][1],
remove the unused [keystone_authtoken]

[0]: https://github.com/openstack/ceilometer/blob/master/devstack/plugin.sh#L294
[1]: https://docs.openstack.org/ceilometer/latest/configuration/index.html

Change-Id: Ic92f9ecb1a43c11311f2a428611e78c0986f02cf
This commit is contained in:
ZhijunWei 2018-04-29 06:38:49 +00:00 committed by weizj
parent de1777134e
commit 96d2749e8d
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ansible/roles/ceilometer/templates/ceilometer.conf.j2
View File

@ -15,21 +15,6 @@ hypervisor_inspector = vsphere
hypervisor_inspector = xenapi hypervisor_inspector = xenapi
{% endif %} {% endif %}
[keystone_authtoken]
auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
project_domain_name = {{ default_project_domain_name }}
project_name = service
user_domain_name = {{ default_user_domain_name }}
username = {{ ceilometer_keystone_user }}
password = {{ ceilometer_keystone_password }}
auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
auth_type = password
memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }}
memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
[service_credentials] [service_credentials]
auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3 auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}