From 23e1e524a4303e5fe48b935a8ee3bcc73f592b46 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Thu, 28 May 2015 10:22:39 -0700
Subject: Make nova-controller start.sh bashate compliant

Change-Id: Icb18833fc4570db6874fa334811ebd3606149dfc
Partially-Implements: blueprint bashate-gate
---
 docker/centos/binary/nova-controller/nova-conductor/start.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'docker/centos/binary/nova-controller')

diff --git a/docker/centos/binary/nova-controller/nova-conductor/start.sh b/docker/centos/binary/nova-controller/nova-conductor/start.sh
index 5e01b7f30..575e7ff6c 100755
--- a/docker/centos/binary/nova-controller/nova-conductor/start.sh
+++ b/docker/centos/binary/nova-controller/nova-conductor/start.sh
@@ -12,8 +12,7 @@ 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
+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}'
-- 
cgit v1.2.3