diff options
| author | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2020-09-23 10:24:29 +0200 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2020-09-23 10:24:29 +0200 |
| commit | 7261c3b1704590f492206096df4625f9abb871c6 (patch) | |
| tree | 991b35dd73ff80c01ddc27f1d560073d4aa1e7e5 | |
| parent | e40bf80f98ec470f4358fe9511d3bea968f2a25f (diff) | |
| download | kolla-7261c3b1704590f492206096df4625f9abb871c6.tar.gz kolla-7261c3b1704590f492206096df4625f9abb871c6.zip | |
Restore Neutron migrations
For details see [1].
Note this will also be amended on the Kolla-Ansible side to squash
[2] as well.
[1] https://review.opendev.org/750075
[2] https://bugs.launchpad.net/kolla-ansible/+bug/1894380
Change-Id: Id47ea8a5ea5318a69cf6814162db2115b40c7e6f
| -rw-r--r-- | docker/neutron/neutron-server/extend_start.sh | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/docker/neutron/neutron-server/extend_start.sh b/docker/neutron/neutron-server/extend_start.sh index f8017fd08..5a414e856 100644 --- a/docker/neutron/neutron-server/extend_start.sh +++ b/docker/neutron/neutron-server/extend_start.sh @@ -3,12 +3,11 @@ # 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 - # if [[ "${!NEUTRON_BOOTSTRAP_SERVICES[@]}" ]]; then - # for service in ${NEUTRON_BOOTSTRAP_SERVICES}; do - # neutron-db-manage --subproject $service upgrade head - # done - # fi - # FIXME(yoctozepto): dirty hack to pass CI (uncomment the above when done) + 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 @@ -25,12 +24,11 @@ if [[ "${!KOLLA_UPGRADE[@]}" ]]; then echo "Contracting database" fi - # if [[ "${!NEUTRON_ROLLING_UPGRADE_SERVICES[@]}" ]]; then - # for service in ${NEUTRON_ROLLING_UPGRADE_SERVICES}; do - # neutron-db-manage --subproject $service upgrade $DB_ACTION - # done - # fi - # FIXME(yoctozepto): dirty hack to pass CI (uncomment the above when done) + 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 |