diff options
Diffstat (limited to 'docker')
| -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 |