aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRadosław Piliszek <radoslaw.piliszek@gmail.com>2020-09-30 18:45:03 +0200
committerRadosław Piliszek <radoslaw.piliszek@gmail.com>2020-09-30 18:45:03 +0200
commitfaaa38f9c4320e90a8ecd199f7610ed343e25f74 (patch)
tree668dc2778da3e27297dbf7a260526c938a45e27e
parentd033d91f94a81b3566b489c46860af25fed8312c (diff)
downloadkolla-faaa38f9c4320e90a8ecd199f7610ed343e25f74.tar.gz
kolla-faaa38f9c4320e90a8ecd199f7610ed343e25f74.zip
Fix Neutron migrations order
It seems I mixed up the order when commenting/uncommenting. Neutron base has to go first. Change-Id: Ib2bf51d4c6e2a574b98671a699777cd8a9a22768
-rw-r--r--docker/neutron/neutron-server/extend_start.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/neutron/neutron-server/extend_start.sh b/docker/neutron/neutron-server/extend_start.sh
index 5a414e856..630eb6e1f 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