Merge "Fix Vitrage wrong configuration"

ansible/roles/vitrage/tasks/register.yml

@@ -30,3 +30,14 @@
       auth: "{{ openstack_vitrage_auth }}"
       endpoint_type: "{{ openstack_interface }}"
   run_once: True
+
+- name: Adding vitrage user into admin project
+  kolla_toolbox:
+    module_name: "os_user_role"
+    module_args:
+      user: "{{ vitrage_keystone_user }}"
+      role: "admin"
+      project: "admin"
+      auth: "{{ openstack_vitrage_auth }}"
+      endpoint_type: "{{ openstack_interface }}"
+  run_once: True

ansible/roles/vitrage/templates/vitrage.conf.j2

@@ -45,12 +45,12 @@ 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]
-auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
+auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3
 region_name = {{ openstack_region_name }}
 auth_type = password
 project_domain_id = default
 user_domain_id = default
-project_name = service
+project_name = admin
 password = {{ vitrage_keystone_password }}
 username = {{ vitrage_keystone_user }}
 interface = internal