Merge ~degorenko/ubuntu/+source/sahara:master into ~ubuntu-server-dev/ubuntu/+source/sahara:master

[Denis Egorenko]

Remove executing db-manage from post installation script

Currently Sahara doesn't support Sqlite DB and also Mysql or another
db can be unconfigured, so we need to remove executing of db-manage
from post installation script.

Closes-bug: #1452698

diff --git a/debian/changelog b/debian/changelog
index 3332261..399c0e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sahara (1:3.0.0~b2-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Remove executing db-manage from post installation script
+    Currently Sahara doesn't support Sqlite DB and also Mysql or another
+    db can be unconfigured, so we need to remove executing of db-manage
+    from post installation script.
+
+ -- Denis Egorenko <[e-mail]>  Wed, 26 Aug 2015 18:54:51 +0300
+
 sahara (1:3.0.0~b2-0ubuntu1) wily; urgency=medium
 
   * New upstream milestone for OpenStack Liberty.
diff --git a/debian/sahara-common.postinst.in b/debian/sahara-common.postinst.in
index 66c0283..a6608ad 100644
--- a/debian/sahara-common.postinst.in
+++ b/debian/sahara-common.postinst.in
@@ -11,10 +11,6 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
     chown -R root:sahara /etc/sahara
     chmod 0750 /etc/sahara
 
-    if ! grep -qE "^(sql_)?connection( )?=.*" ${SAHARA_CONF} || \
-         grep -qE "^(sql_)?connection.*sqlite.*" ${SAHARA_CONF}; then
-		su -s /bin/sh -c 'sahara-db-manage --config-file /etc/sahara/sahara.conf upgrade head' sahara
-	fi
 fi
 
 #DEBHELPER#