Merge "Fix Neutron migrations order"

This commit is contained in:
Zuul 2020-10-01 20:01:38 +00:00 committed by Gerrit Code Review
commit 1666ee5b76

View File

@ -3,12 +3,12 @@
# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
# of the KOLLA_BOOTSTRAP variable being set, including empty.
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
neutron-db-manage --subproject neutron upgrade head
if [[ "${!NEUTRON_BOOTSTRAP_SERVICES[@]}" ]]; then
for service in ${NEUTRON_BOOTSTRAP_SERVICES}; do
neutron-db-manage --subproject $service upgrade head
done
fi
neutron-db-manage --subproject neutron upgrade head
exit 0
fi
@ -24,11 +24,11 @@ if [[ "${!KOLLA_UPGRADE[@]}" ]]; then
echo "Contracting database"
fi
neutron-db-manage --subproject neutron upgrade $DB_ACTION
if [[ "${!NEUTRON_ROLLING_UPGRADE_SERVICES[@]}" ]]; then
for service in ${NEUTRON_ROLLING_UPGRADE_SERVICES}; do
neutron-db-manage --subproject $service upgrade $DB_ACTION
done
fi
neutron-db-manage --subproject neutron upgrade $DB_ACTION
exit 0
fi