aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-24 10:31:46 +0000
committerGerrit Code Review <review@openstack.org>2017-02-24 10:31:46 +0000
commit3aa24d7857bf950344ee6a23cbfd49dde9ee23a5 (patch)
tree26a4e97865692664eb12719ac946cb651017cc5c
parent4a15181f3faf4ff743fcf3109262a30f6a393968 (diff)
parentda209cc1812719ebc2f08d9c95ae8be48b1e0e07 (diff)
downloadkolla-3aa24d7857bf950344ee6a23cbfd49dde9ee23a5.tar.gz
kolla-3aa24d7857bf950344ee6a23cbfd49dde9ee23a5.zip
Merge "Apply neutron database migration"
-rw-r--r--docker/neutron/neutron-server/extend_start.sh14
1 files changed, 14 insertions, 0 deletions
diff --git a/docker/neutron/neutron-server/extend_start.sh b/docker/neutron/neutron-server/extend_start.sh
index dba1e632f..1d3a31479 100644
--- a/docker/neutron/neutron-server/extend_start.sh
+++ b/docker/neutron/neutron-server/extend_start.sh
@@ -6,3 +6,17 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head
exit 0
fi
+
+# Migrate database and exit if KOLLA_UPGRADE variable is set. This catches all cases
+# of the KOLLA_UPGRADE variable being set, including empty.
+if [[ "${!KOLLA_UPGRADE[@]}" ]]; then
+ if [[ "${!NEUTRON_DB_EXPAND[@]}" ]]; then
+ echo "Expanding database"
+ neutron-db-manage upgrade --expand
+ fi
+ if [[ "${!NEUTRON_DB_CONTRACT[@]}" ]]; then
+ echo "Contracting database"
+ neutron-db-manage upgrade --contract
+ fi
+ exit 0
+fi