Switch Neutron packages to Ubuntu compatible naming scheme

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

diff --git a/tests/runtests.sh b/tests/runtests.sh
index a15a6e40ca3ac4401013bfdfcfef2dc419c3e27f..50108c7222f46f5ad12329f2d9979ad3c4569672 100755 (executable)
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -23,7 +23,7 @@ install_packages() {
     then
         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
-        apt-get install -y --force-yes rabbitmq-server mysql-server mysql-client-core-5.5 python-mysqldb keystone
+        DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes rabbitmq-server mysql-server mysql-client-core-5.5 python-mysqldb keystone
     else
         #yum install -y openstack-keystone rabbitmq-server mysql-server MySQL-client python-oslo-utils
         yum install -y openstack-keystone rabbitmq-server python-oslo-utils
@@ -40,7 +40,7 @@ install_packages() {
 install_neutron_server () {
     if $UBUNTU
     then
-        apt-get install -y --force-yes neutron-server
+        DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes neutron-server
     else
         yum install -y openstack-neutron openstack-neutron-ml2
     fi
@@ -210,10 +210,11 @@ check_neutron_openvswitch () {
     if ! $SERVICE_STARTED ; then
         if $UBUNTU; then
             restart_service openvswitch-switch
+            restart_service neutron-plugin-openvswitch-agent
         else
             restart_service openvswitch
+            restart_service neutron-openvswitch-agent
         fi
-        restart_service neutron-openvswitch-agent
         SERVICE_STARTED=true
     fi