From ff42ff20048ef3b7d2f8df04ada8ff4bf7b710e0 Mon Sep 17 00:00:00 2001
From: Gauvain Pocentek <gauvainpocentek@gmail.com>
Date: Tue, 10 Mar 2020 12:46:17 +0100
Subject: [PATCH] Fix invalid test in cinder data migration script

The extend_start.sh script for cinder-api uses an incorrect test to
check if the MAX_NUMBER variable is set. This leads to a incorrect
cinder-manage command being run if this variable is not set, making the
database migration fail.

This change fixes the test to properly use the MAX_NUMBER variable.

Change-Id: Ie46da709db0de09a9cf641b3c154275282f213fc
Closes-Bug: #1866827
---
 docker/cinder/cinder-api/extend_start.sh             | 2 +-
 releasenotes/notes/bug-1866827-5351ec43486d7f33.yaml | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/bug-1866827-5351ec43486d7f33.yaml

diff --git a/docker/cinder/cinder-api/extend_start.sh b/docker/cinder/cinder-api/extend_start.sh
index cc0fd43f29..353983a957 100644
--- a/docker/cinder/cinder-api/extend_start.sh
+++ b/docker/cinder/cinder-api/extend_start.sh
@@ -9,7 +9,7 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
 fi
 
 if [[ "${!KOLLA_OSM[@]}" ]]; then
-    if [[ -z ${MAX_NUMBER} ]]; then
+    if [[ "${!MAX_NUMBER[@]}" ]]; then
         cinder-manage db online_data_migrations --max_count ${MAX_NUMBER}
     else
         cinder-manage db online_data_migrations
diff --git a/releasenotes/notes/bug-1866827-5351ec43486d7f33.yaml b/releasenotes/notes/bug-1866827-5351ec43486d7f33.yaml
new file mode 100644
index 0000000000..63fae75ec0
--- /dev/null
+++ b/releasenotes/notes/bug-1866827-5351ec43486d7f33.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes the MAX_NUMBER variable usage when running the database online
+    migrations for cinder.