openstack
/
neutron
Code Issues Proposed changes

Remove disable_service from DBs configuration 

Remove disable_service from configure_for_func_testing.
A recent Devstack patch (Linked in bug report) checks
that a disabled service is not enabled later. This breaks
the code this patch touches. I believe the DBs were disabled
and enabled with the assumption that Devstack expects only
a single DB to be configured at a time, but that doesn't
seem to be the case. Simply removing the disable calls seems
to work fine.

Closes-Bug: #1505259
Closes-Bug: #1505295

Conflicts:
	requirements.txt

Depends-On: I47ab12f719fba41c2f0c03047b05eb28f4423682
Change-Id: I0fbcc1218e1aa9adbf89f6121c1c2e224ed93cab
(cherry picked from commit 8a9de547ed)
This commit is contained in:
Assaf Muller 2015-10-12 10:40:49 -04:00 committed by Ihar Hrachyshka
parent b760d05ede
commit 49f0432cf3
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/configure_for_func_testing.sh
View File

@ -130,13 +130,11 @@ function _install_databases {
source $DEVSTACK_PATH/lib/database
disable_service postgresql
enable_service mysql
initialize_database_backends
install_database
configure_database_mysql
disable_service mysql
enable_service postgresql
initialize_database_backends
install_database