diff options
| author | Ryan Hallisey <rhallise@redhat.com> | 2015-06-22 15:29:54 -0400 |
|---|---|---|
| committer | Ryan Hallisey <rhallise@redhat.com> | 2015-06-22 16:37:14 -0400 |
| commit | 2dbde4ad8e2dfdc89701cae48a1fc77f5489ddda (patch) | |
| tree | 01a4e40db126698f31164a5c0f0a13d9225c8c5f /docker/common/nova-controller | |
| parent | 64f23c1d133fea984a88f4487fe44d088b3419b1 (diff) | |
| download | kolla-2dbde4ad8e2dfdc89701cae48a1fc77f5489ddda.tar.gz kolla-2dbde4ad8e2dfdc89701cae48a1fc77f5489ddda.zip | |
Add option to not run db sync
Database syncs should not be required every time a container starts.
We can default database startup to true, but give the option
to set it to false.
Change-Id: Ib76876b2671f6c31f4511412efd3a438ec78f01f
Closes-bug: #1467576
Diffstat (limited to 'docker/common/nova-controller')
| -rwxr-xr-x | docker/common/nova-controller/nova-conductor/start.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/docker/common/nova-controller/nova-conductor/start.sh b/docker/common/nova-controller/nova-conductor/start.sh index 575e7ff6c..3bba8cf3a 100755 --- a/docker/common/nova-controller/nova-conductor/start.sh +++ b/docker/common/nova-controller/nova-conductor/start.sh @@ -4,7 +4,8 @@ set -e . /opt/kolla/config-nova.sh -check_required_vars NOVA_DB_NAME NOVA_DB_USER NOVA_DB_PASSWORD +check_required_vars NOVA_DB_NAME NOVA_DB_USER NOVA_DB_PASSWORD \ + INIT_NOVA_DB fail_unless_db cfg=/etc/nova/nova.conf @@ -12,12 +13,14 @@ cfg=/etc/nova/nova.conf # configure logging crudini --set $cfg DEFAULT log_file "${NOVA_CONDUCTOR_LOG_FILE}" -mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF +if [ "${INIT_NOVA_DB}" == "true" ]; then + mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF CREATE DATABASE IF NOT EXISTS ${NOVA_DB_NAME}; GRANT ALL PRIVILEGES ON ${NOVA_DB_NAME}.* TO - '${NOVA_DB_USER}'@'%' IDENTIFIED BY '${NOVA_DB_PASSWORD}' + '${NOVA_DB_USER}'@'%' IDENTIFIED BY '${NOVA_DB_PASSWORD}' EOF -nova-manage db sync + nova-manage db sync +fi exec /usr/bin/nova-conductor --config-file /etc/nova/nova.conf |