summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-03-25 12:30:56 +0000
committerGerrit Code Review <review@openstack.org>2020-03-25 12:30:56 +0000
commit4716a2802b57cd91d8ff7fd01288e1f6d2ba070e (patch)
tree03ba1de2f9613a747fa0729e7ff17e61b0002613
parent39820c4abb83c55e66e7760c5844754fc07e4599 (diff)
parentff42ff20048ef3b7d2f8df04ada8ff4bf7b710e0 (diff)
downloadkolla-4716a2802b57cd91d8ff7fd01288e1f6d2ba070e.tar.gz
kolla-4716a2802b57cd91d8ff7fd01288e1f6d2ba070e.zip
Merge "Fix invalid test in cinder data migration script"
-rw-r--r--docker/cinder/cinder-api/extend_start.sh2
-rw-r--r--releasenotes/notes/bug-1866827-5351ec43486d7f33.yaml5
2 files changed, 6 insertions, 1 deletions
diff --git a/docker/cinder/cinder-api/extend_start.sh b/docker/cinder/cinder-api/extend_start.sh
index cc0fd43f2..353983a95 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 000000000..63fae75ec
--- /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.