summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-06-28 08:11:31 +0000
committerGerrit Code Review <review@openstack.org>2019-06-28 08:11:31 +0000
commitefdc4c6a481ef60192ca88df3590a86a46f1d204 (patch)
tree48055f8cf6ef689540b1385a0d033720baf12099 /docker
parent4923e714b0ec7666405b91f2b3665ef36e72ae89 (diff)
parent09226a59866e5ace7d573bac2e0772109a2554a0 (diff)
downloadkolla-efdc4c6a481ef60192ca88df3590a86a46f1d204.tar.gz
kolla-efdc4c6a481ef60192ca88df3590a86a46f1d204.zip
Merge "Run nova api_db sync before db sync" into stable/stein
Diffstat (limited to 'docker')
-rw-r--r--docker/nova/nova-api/extend_start.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/nova/nova-api/extend_start.sh b/docker/nova/nova-api/extend_start.sh
index 49c83415f..428d8945a 100644
--- a/docker/nova/nova-api/extend_start.sh
+++ b/docker/nova/nova-api/extend_start.sh
@@ -3,15 +3,15 @@
# 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
- nova-manage db sync
nova-manage api_db sync
+ nova-manage db sync
nova-manage db online_data_migrations
exit 0
fi
if [[ "${!KOLLA_UPGRADE[@]}" ]]; then
- nova-manage db sync
nova-manage api_db sync
+ nova-manage db sync
exit 0
fi