From: Assaf Muller <amuller@redhat.com>
Date: Mon, 12 Oct 2015 14:40:49 +0000 (-0400)
Subject: Remove disable_service from DBs configuration
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8a9de547ed4a15b9ac0eb0d085025d7c97fbf594;p=openstack-build%2Fneutron-build.git

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.

Also exclude oslo.messaging==2.6.0 as per global-requirements.txt.

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

Depends-On: I47ab12f719fba41c2f0c03047b05eb28f4423682
Change-Id: I0fbcc1218e1aa9adbf89f6121c1c2e224ed93cab
---

diff --git a/requirements.txt b/requirements.txt
index 751d14bc8..3080e542d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -31,7 +31,7 @@ oslo.context>=0.2.0 # Apache-2.0
 oslo.db>=2.4.1 # Apache-2.0
 oslo.i18n>=1.5.0 # Apache-2.0
 oslo.log>=1.8.0 # Apache-2.0
-oslo.messaging!=1.17.0,!=1.17.1,>=1.16.0 # Apache-2.0
+oslo.messaging!=1.17.0,!=1.17.1,>=1.16.0,!=2.6.0 # Apache-2.0
 oslo.middleware>=2.8.0 # Apache-2.0
 oslo.policy>=0.5.0 # Apache-2.0
 oslo.rootwrap>=2.0.0 # Apache-2.0
diff --git a/tools/configure_for_func_testing.sh b/tools/configure_for_func_testing.sh
index 9a9619241..3a431b029 100755
--- a/tools/configure_for_func_testing.sh
+++ b/tools/configure_for_func_testing.sh
@@ -124,13 +124,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