diff options
| author | Zuul <zuul@review.opendev.org> | 2020-10-01 20:01:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-10-01 20:01:38 +0000 |
| commit | 1666ee5b768fee7075e59c2a1409a4bee43e8b5b (patch) | |
| tree | 8f1c0d4b10789733ce7302b7037f1e40385dcac6 | |
| parent | 2e094adbbb128c06fdd32fea4c06ef86db1490d6 (diff) | |
| parent | faaa38f9c4320e90a8ecd199f7610ed343e25f74 (diff) | |
| download | kolla-1666ee5b768fee7075e59c2a1409a4bee43e8b5b.tar.gz kolla-1666ee5b768fee7075e59c2a1409a4bee43e8b5b.zip | |
Merge "Fix Neutron migrations order"
| -rw-r--r-- | docker/neutron/neutron-server/extend_start.sh | 4 |
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 |