summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorRyan Hallisey <rhallise@redhat.com>2014-10-14 12:52:40 +0000
committerRyan Hallisey <rhallise@redhat.com>2014-10-14 12:54:23 +0000
commitc4b955f6623824c84180d8780580e56410f389db (patch)
treeb8a040f012b11c7235fe0a824bdd5aac31838f7c /docker
parentcd13790136de3ada1973ba639eff1bcf1fb5e544 (diff)
downloadkolla-c4b955f6623824c84180d8780580e56410f389db.tar.gz
kolla-c4b955f6623824c84180d8780580e56410f389db.zip
Config will be done by the controller
Remove config setup in nova-conductor. Change-Id: I0740e6a69601ab4a39c20a3287792013355a9262
Diffstat (limited to 'docker')
-rw-r--r--docker/nova-controller/nova-conductor/start.sh2
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};