From de16013bd630019c4febdb618a3e0c5bf93f7e6f Mon Sep 17 00:00:00 2001
From: Jegor van Opdorp <jegorvanopdorp@gmail.com>
Date: Thu, 13 Aug 2020 11:45:26 +0200
Subject: [PATCH] Add cinder auth config to nova-cell nova.conf.j2
Fixes an issue during deleting evacuated instances with encrypted block
devices.
Change-Id: I9b9b689ef7e1e41b597e2c5f6b96f3ed011193c5
Closes-Bug: 1891462
Related-Bug: 1850279
---
ansible/roles/nova-cell/templates/nova.conf.j2 | 7 +++++++
.../fix-evacuate-cinder-encryption-489f8cf6a340e7be.yaml | 6 ++++++
2 files changed, 13 insertions(+)
create mode 100644 releasenotes/notes/fix-evacuate-cinder-encryption-489f8cf6a340e7be.yaml
diff --git a/ansible/roles/nova-cell/templates/nova.conf.j2 b/ansible/roles/nova-cell/templates/nova.conf.j2
index 5bbd4f1629..7c9fe16a8d 100644
--- a/ansible/roles/nova-cell/templates/nova.conf.j2
+++ b/ansible/roles/nova-cell/templates/nova.conf.j2
@@ -106,6 +106,13 @@ num_retries = 3
[cinder]
catalog_info = volumev3:cinderv3:internalURL
os_region_name = {{ openstack_region_name }}
+auth_url = {{ keystone_admin_url }}
+auth_type = password
+project_domain_name = {{ default_project_domain_name }}
+user_domain_id = {{ default_user_domain_id }}
+project_name = service
+username = {{ cinder_keystone_user }}
+password = {{ cinder_keystone_password }}
cafile = {{ openstack_cacert }}
{% endif %}
diff --git a/releasenotes/notes/fix-evacuate-cinder-encryption-489f8cf6a340e7be.yaml b/releasenotes/notes/fix-evacuate-cinder-encryption-489f8cf6a340e7be.yaml
new file mode 100644
index 0000000000..1fec9fae7a
--- /dev/null
+++ b/releasenotes/notes/fix-evacuate-cinder-encryption-489f8cf6a340e7be.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+ - |
+ Fixes an issue during deleting evacuated instances
+ with encrypted block devices.
+ `LP#1891462 <https://launchpad.net/bugs/1891462>`__