diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-14 19:20:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-14 19:20:05 +0000 |
| commit | 578aab571f45c02af6a23d40b6149ec61c425686 (patch) | |
| tree | 8453406c8e4a09bfaa60c1d0fed4a518b5aeb7fb /docker/nova-controller | |
| parent | a6edd270db737ab414afdae1daf268b3bdadacd5 (diff) | |
| parent | c4b955f6623824c84180d8780580e56410f389db (diff) | |
| download | kolla-578aab571f45c02af6a23d40b6149ec61c425686.tar.gz kolla-578aab571f45c02af6a23d40b6149ec61c425686.zip | |
Merge "Config will be done by the controller"
Diffstat (limited to 'docker/nova-controller')
| -rw-r--r-- | docker/nova-controller/nova-conductor/start.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/docker/nova-controller/nova-conductor/start.sh b/docker/nova-controller/nova-conductor/start.sh index 9edf92015..9fdc8f61b 100644 --- a/docker/nova-controller/nova-conductor/start.sh +++ b/docker/nova-controller/nova-conductor/start.sh @@ -22,8 +22,6 @@ if ! [ "$NOVA_DB_PASSWORD" ]; then export NOVA_DB_PASSWORD fi -sh /opt/nova/config-nova.sh conductor - mysql -h ${MARIADBMASTER_PORT_3306_TCP_ADDR} -u root \ -p${DB_ROOT_PASSWORD} mysql <<EOF CREATE DATABASE IF NOT EXISTS ${NOVA_DB_NAME}; |