From e180a98094c149bbb74900beeee317aeb1cdb50d Mon Sep 17 00:00:00 2001 From: ZhijunWei Date: Wed, 23 May 2018 07:06:17 +0000 Subject: [PATCH] Remove keystone_authtoken section for vitrage 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]: https://github.com/openstack/vitrage/blob/5c4bd36e8090ecbfca48980bc47c89e4808230b1/vitrage/opts.py#L56 Change-Id: Id22e59ff572a2fef08906bf6cc48578981d2efd6 --- .../roles/vitrage/templates/vitrage.conf.j2 | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/ansible/roles/vitrage/templates/vitrage.conf.j2 b/ansible/roles/vitrage/templates/vitrage.conf.j2 index bb56278336..ff92dbfad4 100644 --- a/ansible/roles/vitrage/templates/vitrage.conf.j2 +++ b/ansible/roles/vitrage/templates/vitrage.conf.j2 @@ -18,20 +18,6 @@ host = {{ api_interface_address }} port = {{ vitrage_api_port }} 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] 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 }} 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] topics = notifications,vitrage_notifications driver = messagingv2