From: Zane Bitter <zbitter@redhat.com>
Date: Fri, 13 Apr 2012 10:10:10 +0000 (+0200)
Subject: Issue #52: Fix error in db-setup script
X-Git-Tag: 2014.1~2035
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a03a307d33ef5fedab6ec08532a1ed4b82c25b5a;p=openstack-build%2Fheat-build.git

Issue #52: Fix error in db-setup script

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

diff --git a/bin/heat-db-setup-fedora b/bin/heat-db-setup-fedora
index 764c077c..8d2eff95 100755
--- a/bin/heat-db-setup-fedora
+++ b/bin/heat-db-setup-fedora
@@ -215,13 +215,13 @@ if [ "${MYSQL_HEAT_PW}" != "${MYSQL_HEAT_PW_DEFAULT}" ] ; then
 	sed -i -e "s/mysql:\/\/heat:\(.*\)@/mysql:\/\/heat:${MYSQL_HEAT_PW}@/" ${HEAT_CONFIG}
 fi
 
-#create the schema using sqlalchemy-migrate
-#if [ $1='rpm' ];
-#then
-#  pushd /usr/lib/python2.7/site-packages/heat/db/sqlalchemy
-#else
+# Create the schema using sqlalchemy-migrate
+if [ "$1" = "rpm" ]
+then
+  pushd /usr/lib/python2.7/site-packages/heat/db/sqlalchemy
+else
   pushd /usr/lib/python2.7/site-packages/heat-0.0.1-py2.7.egg/heat/db/sqlalchemy/
-#fi
+fi
 
 python migrate_repo/manage.py version_control mysql://heat:heat@localhost/heat migrate_repo
 python manage.py upgrade