openstack/kolla
Code Issues Proposed changes

Restore Neutron migrations

Browse Source 
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
This commit is contained in:
Radosław Piliszek 2020-09-23 10:24:29 +02:00
parent e40bf80f98
commit 7261c3b170
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
docker/neutron/neutron-server/extend_start.sh
View File

@ -3,12 +3,11 @@
# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
# of the KOLLA_BOOTSTRAP variable being set, including empty. # of the KOLLA_BOOTSTRAP variable being set, including empty.
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
# if [[ "${!NEUTRON_BOOTSTRAP_SERVICES[@]}" ]]; then if [[ "${!NEUTRON_BOOTSTRAP_SERVICES[@]}" ]]; then
# for service in ${NEUTRON_BOOTSTRAP_SERVICES}; do for service in ${NEUTRON_BOOTSTRAP_SERVICES}; do
# neutron-db-manage --subproject $service upgrade head neutron-db-manage --subproject $service upgrade head
# done done
# fi fi
# FIXME(yoctozepto): dirty hack to pass CI (uncomment the above when done)
neutron-db-manage --subproject neutron upgrade head neutron-db-manage --subproject neutron upgrade head
exit 0 exit 0
fi fi
@ -25,12 +24,11 @@ if [[ "${!KOLLA_UPGRADE[@]}" ]]; then
echo "Contracting database" echo "Contracting database"
fi fi
# if [[ "${!NEUTRON_ROLLING_UPGRADE_SERVICES[@]}" ]]; then if [[ "${!NEUTRON_ROLLING_UPGRADE_SERVICES[@]}" ]]; then
# for service in ${NEUTRON_ROLLING_UPGRADE_SERVICES}; do for service in ${NEUTRON_ROLLING_UPGRADE_SERVICES}; do
# neutron-db-manage --subproject $service upgrade $DB_ACTION neutron-db-manage --subproject $service upgrade $DB_ACTION
# done done
# fi fi
# FIXME(yoctozepto): dirty hack to pass CI (uncomment the above when done)
neutron-db-manage --subproject neutron upgrade $DB_ACTION neutron-db-manage --subproject neutron upgrade $DB_ACTION
exit 0 exit 0
fi fi