openstack/kolla-ansible
Code Issues Proposed changes

Remove keystone_authtoken section for vitrage

Browse Source 
1. Now, the vitrage use [service_credentials] to get credentials[0],
remove the unused [keystone_authtoken]
2. Move memcache stuff into service_credentials section

[0]: 5c4bd36e80/vitrage/opts.py (L56)

Change-Id: Id22e59ff572a2fef08906bf6cc48578981d2efd6
This commit is contained in:
ZhijunWei 2018-05-23 07:06:17 +00:00
parent 2ca94a62d1
commit e180a98094
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ansible/roles/vitrage/templates/vitrage.conf.j2
View File

@ -18,20 +18,6 @@ host = {{ api_interface_address }}
port = {{ vitrage_api_port }} port = {{ vitrage_api_port }}
workers = {{ openstack_service_workers }} workers = {{ openstack_service_workers }}
[keystone_authtoken]
auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
auth_type = password
project_domain_id = default
user_domain_id = default
project_name = service
username = {{ vitrage_keystone_user }}
password = {{ vitrage_keystone_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 %}
[database] [database]
connection = mysql+pymysql://{{ vitrage_database_user }}:{{ vitrage_database_password }}@{{ vitrage_database_address }}/{{ vitrage_database_name }} connection = mysql+pymysql://{{ vitrage_database_user }}:{{ vitrage_database_password }}@{{ vitrage_database_address }}/{{ vitrage_database_name }}
@ -54,6 +40,10 @@ password = {{ vitrage_keystone_password }}
username = {{ vitrage_keystone_user }} username = {{ vitrage_keystone_user }}
interface = internal interface = internal
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 %}
[oslo_messaging_notifications] [oslo_messaging_notifications]
topics = notifications,vitrage_notifications topics = notifications,vitrage_notifications
driver = messagingv2 driver = messagingv2