openstack/kolla
Code Issues Proposed changes

Fix Neutron migrations order

Browse Source 
It seems I mixed up the order when commenting/uncommenting.
Neutron base has to go first.

Change-Id: Ib2bf51d4c6e2a574b98671a699777cd8a9a22768
This commit is contained in:
Radosław Piliszek 2020-09-30 18:45:03 +02:00
parent d033d91f94
commit faaa38f9c4
1 changed files with 2 additions and 2 deletions

4
docker/neutron/neutron-server/extend_start.sh

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