From a4b4043308f2caa4df2318648bfbfbab4e7902dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Mon, 3 Oct 2022 15:58:32 +0200
Subject: [PATCH] Fix image from volume upload ERRORs and WARNINGs with Ceph
 RBD

By resetting image_upload_use_cinder_backend to upstream default.

When uploading volume to glance image, cinder looks at the backend's
image_upload_use_cinder_backend config knob to decide whether to try link
the glance image to a cloned volume made by cinder, i.e. by doing all work
locally and only updating glance's locations for the image (when the knob
is set to True). However, after all [1], [2] and [3], which happens since
Victoria, this option requires further config from user (using volume type
with image_service:store_id property (aka extra spec) set to the desired
glance store (even if there is only one cinder store configured).

Please read the bug report as to why the option removal is the
best option (TL;DR it is the most compatible approach).

[1] https://review.opendev.org/c/openstack/kolla-ansible/+/708114
[2] https://review.opendev.org/c/openstack/glance_store/+/746556
[3] https://review.opendev.org/c/openstack/cinder/+/661676

Closes-Bug: #1991516
Change-Id: Ife87ee0241d907a0c407eb21811a354ed1734408
---
 ansible/roles/cinder/templates/cinder.conf.j2       |  1 -
 .../notes/bug-1991516-cc280aa71e8dc417.yaml         | 13 +++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/bug-1991516-cc280aa71e8dc417.yaml

diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2
index 1d0cd4dc83..565ab44376 100644
--- a/ansible/roles/cinder/templates/cinder.conf.j2
+++ b/ansible/roles/cinder/templates/cinder.conf.j2
@@ -137,7 +137,6 @@ rados_connect_timeout = 5
 rbd_user = {{ ceph_cinder_user }}
 rbd_secret_uuid = {{ cinder_rbd_secret_uuid }}
 report_discard_supported = True
-image_upload_use_cinder_backend = True
 {% endif %}
 
 {% if enable_cinder_backend_nfs | bool %}
diff --git a/releasenotes/notes/bug-1991516-cc280aa71e8dc417.yaml b/releasenotes/notes/bug-1991516-cc280aa71e8dc417.yaml
new file mode 100644
index 0000000000..fb7b9be674
--- /dev/null
+++ b/releasenotes/notes/bug-1991516-cc280aa71e8dc417.yaml
@@ -0,0 +1,13 @@
+---
+upgrade:
+  - |
+    ``image_upload_use_cinder_backend = True`` is no longer set on the
+    Cinder's default Ceph RBD backend, the common upstream default is
+    now used (``False`` currently).
+    See also `LP#1991516 <https://launchpad.net/bugs/1991516>`__
+fixes:
+  - |
+    ``image_upload_use_cinder_backend = True`` is no longer set on the
+    Cinder's default Ceph RBD backend. Related ERRORs and WARNINGs in
+    Cinder and Glance logs are prevented.
+    `LP#1991516 <https://launchpad.net/bugs/1991516>`__