From 8af7372c3dfa8e951c4188a6538cd174688cc849 Mon Sep 17 00:00:00 2001
From: Vladislav Belogrudov <vladislav.belogrudov@oracle.com>
Date: Wed, 23 May 2018 19:25:57 +0300
Subject: [PATCH] Fix Nova authentication in Cinder configuration file

Cinder requires access to Nova during Nova assisted backups and
snapshots. Both fail without proper Nova authentication section
in cinder.conf file.

Change-Id: I5d1fc3b466bf2df919e426d2052c1ee31c27030d
Closes-Bug: #1772959
---
 ansible/roles/cinder/templates/cinder.conf.j2 | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2
index 6b2a163d00..7396c8fcc7 100644
--- a/ansible/roles/cinder/templates/cinder.conf.j2
+++ b/ansible/roles/cinder/templates/cinder.conf.j2
@@ -77,9 +77,15 @@ policy_file = {{ cinder_policy_file }}
 {% endif %}
 
 [nova]
-region_name = {{ openstack_region_name }}
 interface = internal
-token_auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
+auth_url = {{ keystone_admin_url }}
+auth_type = password
+project_domain_id = {{ default_project_domain_id }}
+user_domain_id = {{ default_user_domain_id }}
+region_name = {{ openstack_region_name }}
+project_name = service
+username = {{ nova_keystone_user }}
+password = {{ nova_keystone_password }}
 
 [database]
 connection = mysql+pymysql://{{ cinder_database_user }}:{{ cinder_database_password }}@{{ cinder_database_address }}/{{ cinder_database_name }}