From c4b955f6623824c84180d8780580e56410f389db Mon Sep 17 00:00:00 2001
From: Ryan Hallisey <rhallise@redhat.com>
Date: Tue, 14 Oct 2014 12:52:40 +0000
Subject: [PATCH] Config will be done by the controller

Remove config setup in nova-conductor.

Change-Id: I0740e6a69601ab4a39c20a3287792013355a9262
---
 docker/nova-controller/nova-conductor/start.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docker/nova-controller/nova-conductor/start.sh b/docker/nova-controller/nova-conductor/start.sh
index 9edf920155..9fdc8f61b6 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};