Remove patch from Ceilometer source package

[openstack-build/ceilometer-build.git] / tests / runtests.sh

diff --git a/tests/runtests.sh b/tests/runtests.sh
index b202f0aeacf0e8bf379fd6c731a5111a20e33b49..29f8093f36dcd17ddfa3a9ef29b883763e4de728 100755 (executable)
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -133,6 +133,9 @@ install_and_setup_mysql() {
    echo "mysql-server mysql-server/root_password select ${mysql_pass}" | debconf-set-selections
    echo "mysql-server mysql-server/root_password_again select ${mysql_pass}" | debconf-set-selections
    ${command_to_install} mysql-server-5.6 mysql-client-core-5.6 python-mysqldb
+   if [ -f "/etc/mysql/conf.d/wsrep.cnf" ]; then
+     rm -f /etc/mysql/conf.d/wsrep.cnf
+   fi
 
    service ${mysql_service} restart
    sleep 5