Merge "bump manila to latest stable to fix mount issue" into stable/2023.2
diff --git a/images/manila/Dockerfile b/images/manila/Dockerfile
index f4e7c99..500c107 100644
--- a/images/manila/Dockerfile
+++ b/images/manila/Dockerfile
@@ -3,7 +3,7 @@
# Atmosphere-Rebuild-Time: 2024-06-26T17:38:39Z
FROM openstack-venv-builder AS build
-ARG MANILA_GIT_REF=ed585103e4c26478b60b397b0bb064b50dc1acb5
+ARG MANILA_GIT_REF=b4d1e6e9e6e9f77d5fb74c499badae92c271e1ba
ADD --keep-git-dir=true https://opendev.org/openstack/manila.git#${MANILA_GIT_REF} /src/manila
RUN git -C /src/manila fetch --unshallow
COPY patches/manila /patches/manila
diff --git a/releasenotes/notes/fix-manila-device-name-mixed-2cb5f82275df359c.yaml b/releasenotes/notes/fix-manila-device-name-mixed-2cb5f82275df359c.yaml
new file mode 100644
index 0000000..5f7645c
--- /dev/null
+++ b/releasenotes/notes/fix-manila-device-name-mixed-2cb5f82275df359c.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+ - |
+ Updated Manila to utilize device UUIDs instead of device names for mounting
+ operations. This change ensures consistent device identification and
+ prevents device name conflicts that could occur after rebooting the Manila
+ server.