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

Proposed by Denis Egorenko on 2015-08-26
Status: Merged
Merged at revision: 10
Proposed branch: lp:~degorenko/sahara/bug-1452698
Merge into: lp:~ubuntu-server-dev/sahara/kilo
Diff against target: 31 lines (+9/-4)
2 files modified
debian/changelog (+9/-0)
debian/sahara-common.postinst.in (+0/-4)
To merge this branch: bzr merge lp:~degorenko/sahara/bug-1452698
Reviewer Review Type Date Requested Status
Corey Bryant 2015-08-26 Approve on 2015-08-26
Chuck Short 2015-08-26 Pending
Review via email: mp+269235@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
lp:~degorenko/sahara/bug-1452698 updated on 2015-08-26
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.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-04-30 15:06:55 +0000
3+++ debian/changelog 2015-08-26 15:56:03 +0000
4@@ -1,3 +1,12 @@
5+sahara (2015.1.0-0ubuntu2) UNRELEASED; urgency=medium
6+
7+ * Remove executing db-manage from post installation script
8+ Currently Sahara doesn't support Sqlite DB and also Mysql or another
9+ db can be unconfigured, so we need to remove executing of db-manage
10+ from post installation script.
11+
12+ -- Denis Egorenko <degorenko@mirantis.com> Wed, 26 Aug 2015 18:54:51 +0300
13+
14 sahara (2015.1.0-0ubuntu1) UNRELEASED; urgency=medium
15
16 * New upstream release for OpenStack kilo. (LP: #1449744)
17
18=== modified file 'debian/sahara-common.postinst.in'
19--- debian/sahara-common.postinst.in 2015-01-07 14:54:50 +0000
20+++ debian/sahara-common.postinst.in 2015-08-26 15:56:03 +0000
21@@ -11,10 +11,6 @@
22 chown -R root:sahara /etc/sahara
23 chmod 0750 /etc/sahara
24
25- if ! grep -qE "^(sql_)?connection( )?=.*" ${SAHARA_CONF} || \
26- grep -qE "^(sql_)?connection.*sqlite.*" ${SAHARA_CONF}; then
27- su -s /bin/sh -c 'sahara-db-manage --config-file /etc/sahara/sahara.conf upgrade head' sahara
28- fi
29 fi
30
31 #DEBHELPER#

Subscribers

People subscribed via source and target branches