From 16986b4062802eb5f01641677326b51ead575215 Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Fri, 13 Apr 2012 12:10:10 +0200 Subject: [PATCH] Improvements to DB setup Don't fail if the database or user already exists. Signed-off-by: Zane Bitter --- bin/heat-db-setup-fedora | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/bin/heat-db-setup-fedora b/bin/heat-db-setup-fedora index 8d2eff95d5..6153f5353b 100755 --- a/bin/heat-db-setup-fedora +++ b/bin/heat-db-setup-fedora @@ -199,11 +199,9 @@ echo "Verified connectivity to MySQL." echo "Creating 'heat' database." cat << EOF | mysql -u root ${MYSQL_ROOT_PW_ARG} -CREATE DATABASE heat; -CREATE USER 'heat'@'localhost' IDENTIFIED BY '${MYSQL_HEAT_PW}'; -CREATE USER 'heat'@'%' IDENTIFIED BY '${MYSQL_HEAT_PW}'; -GRANT ALL ON heat.* TO 'heat'@'localhost'; -GRANT ALL ON heat.* TO 'heat'@'%'; +CREATE DATABASE IF NOT EXISTS heat; +GRANT ALL ON heat.* TO 'heat'@'localhost' IDENTIFIED BY '${MYSQL_HEAT_PW}'; +GRANT ALL ON heat.* TO 'heat'@'%' IDENTIFIED BY '${MYSQL_HEAT_PW}'; flush privileges; EOF