Merge lp:~degorenko/sahara/bug-1452698 into lp:~ubuntu-server-dev/sahara/kilo

[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.

[lp:~degorenko/sahara/bug-1452698]

11. By Denis Egorenko on 2015-08-26

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.

[Corey Bryant (corey.bryant)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-30 15:06:55 +0000
+++ debian/changelog	2015-08-26 15:56:03 +0000
@@ -1,3 +1,12 @@
+sahara (2015.1.0-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 (2015.1.0-0ubuntu1) UNRELEASED; urgency=medium
 
   * New upstream release for OpenStack kilo. (LP: #1449744)

=== modified file 'debian/sahara-common.postinst.in'
--- debian/sahara-common.postinst.in	2015-01-07 14:54:50 +0000
+++ debian/sahara-common.postinst.in	2015-08-26 15:56:03 +0000
@@ -11,10 +11,6 @@
     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#