Merge "Rebuild neutron in 8.0 branch" into openstack-ci/fuel-8.0/liberty

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

diff --git a/tests/runtests.sh b/tests/runtests.sh
index 50108c7222f46f5ad12329f2d9979ad3c4569672..372e4add2e67067bdafe23189b2035acc5b33a15 100755 (executable)
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -13,7 +13,13 @@ AUTH="--os-auth-url http://127.0.0.1:35357 --os-token $TOKEN --os-endpoint http:
 NEUTRON_AUTH="--os-username neutron --os-password neutron --os-tenant-name neutron --os-auth-url http://127.0.0.1:35357/v2.0"
 CORE_PLUGIN="neutron.plugins.ml2.plugin.Ml2Plugin"
 
-if [[ $PLATFORM =~ Ubuntu ]]; then UBUNTU=true; fi
+if [[ $PLATFORM =~ Ubuntu ]]
+then
+   UBUNTU=true
+else
+   setenforce 0
+fi
+
 if [ -z $PACKAGE ]; then echo "Package for testing is not specified"; exit 1; fi
 echo "127.0.10.1 $(hostname)" >> /etc/hosts
 
@@ -204,7 +210,7 @@ check_neutron_openvswitch () {
     # Workaround for bug #1371184
     if ! $UBUNTU
     then
-        chown root:neutron /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
+        chown root:neutron /etc/neutron/plugins/ml2/openvswitch_agent.ini
     fi
 
     if ! $SERVICE_STARTED ; then