diff options
| author | Steven Dake <stdake@cisco.com> | 2015-05-28 10:22:39 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-06-08 11:01:50 -0700 |
| commit | 23e1e524a4303e5fe48b935a8ee3bcc73f592b46 (patch) | |
| tree | bb447e202dc9cdfd772319d25b7843d1f8f0e6bb | |
| parent | 1531542c999b265466aec55b7698f15985f0c788 (diff) | |
| download | kolla-23e1e524a4303e5fe48b935a8ee3bcc73f592b46.tar.gz kolla-23e1e524a4303e5fe48b935a8ee3bcc73f592b46.zip | |
Make nova-controller start.sh bashate compliant
Change-Id: Icb18833fc4570db6874fa334811ebd3606149dfc
Partially-Implements: blueprint bashate-gate
| -rwxr-xr-x | docker/centos/binary/nova-controller/nova-conductor/start.sh | 3 |
1 files changed, 1 insertions, 2 deletions
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}' |