From: Zane Bitter <zbitter@redhat.com>
Date: Fri, 13 Apr 2012 10:10:10 +0000 (+0200)
Subject: Improvements to DB setup
X-Git-Tag: 2014.1~2034
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=16986b4062802eb5f01641677326b51ead575215;p=openstack-build%2Fheat-build.git

Improvements to DB setup

Don't fail if the database or user already exists.

Signed-off-by: Zane Bitter <zbitter@redhat.com>
---

diff --git a/bin/heat-db-setup-fedora b/bin/heat-db-setup-fedora
index 8d2eff95..6153f535 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