From faaa38f9c4320e90a8ecd199f7610ed343e25f74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Wed, 30 Sep 2020 18:45:03 +0200 Subject: [PATCH] Fix Neutron migrations order It seems I mixed up the order when commenting/uncommenting. Neutron base has to go first. Change-Id: Ib2bf51d4c6e2a574b98671a699777cd8a9a22768 --- docker/neutron/neutron-server/extend_start.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/neutron/neutron-server/extend_start.sh b/docker/neutron/neutron-server/extend_start.sh index 5a414e8566..630eb6e1f0 100644 --- a/docker/neutron/neutron-server/extend_start.sh +++ b/docker/neutron/neutron-server/extend_start.sh @@ -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