From f8fd06011aed5cd9028a8c1e206762a78e137df7 Mon Sep 17 00:00:00 2001 From: zhulingjie Date: Thu, 24 May 2018 22:02:08 +0800 Subject: [PATCH] Remove keystone_authtoken section for aodh 1. Now, the aodh use [service_credentials] to get credentials[0], remove the unused [keystone_authtoken] 2. Move memcache stuff into service_credentials section refer to https://review.openstack.org/#/c/570393/ Change-Id: I08cf3ec4e9ca32cc83d74bd4204e7e170b01feb7 --- ansible/roles/aodh/templates/aodh.conf.j2 | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/ansible/roles/aodh/templates/aodh.conf.j2 b/ansible/roles/aodh/templates/aodh.conf.j2 index 4fb1b19716..30724cbd21 100644 --- a/ansible/roles/aodh/templates/aodh.conf.j2 +++ b/ansible/roles/aodh/templates/aodh.conf.j2 @@ -14,19 +14,6 @@ host = {{ api_interface_address }} [database] connection = mysql+pymysql://{{ aodh_database_user }}:{{ aodh_database_password }}@{{ aodh_database_address }}/{{ aodh_database_name }} -[keystone_authtoken] -memcache_security_strategy = ENCRYPT -memcache_secret_key = {{ memcache_secret_key }} -memcache_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} -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 = {{ aodh_keystone_user }} -password = {{ aodh_keystone_password }} -auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }} -auth_type = password - [oslo_middleware] enable_proxy_headers_parsing = True