]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Create br-int for OVS agent tests 05/905/4
authorSergey Kolekonov <skolekonov@mirantis.com>
Thu, 20 Nov 2014 09:56:36 +0000 (12:56 +0300)
committerSergey Kolekonov <skolekonov@mirantis.com>
Tue, 9 Dec 2014 09:33:10 +0000 (09:33 +0000)
OVS agent requires default bridge (br-int) to work properly

Change-Id: I62dc2fe4f907f203af6aaec3d7fdfed5966e3a3d

tests/runtests.sh

index d123ae16c8f2ee057326ef7c2349f3443d72b994..a730baa8f0255dcd1fd1f121876ecff4f01a14df 100755 (executable)
@@ -21,9 +21,9 @@ 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
+        apt-get install -y --force-yes rabbitmq-server mysql-server mysql-client-core-5.5 python-mysqldb keystone bridge-utils
     else
-        yum install -y openstack-keystone rabbitmq-server mysql-server MySQL-client python-oslo-utils
+        yum install -y openstack-keystone rabbitmq-server mysql-server MySQL-client python-oslo-utils bridge-utils
         #Install some plugins because they are required for db-migration scripts (bug #1371184)
         #Ubuntu neutron-server package include them
         yum install -y openstack-neutron-bigswitch openstack-neutron-brocade openstack-neutron-cisco openstack-neutron-hyperv openstack-neutron-vmware openstack-neutron-openvswitch \
@@ -141,6 +141,9 @@ EOF
         cat /var/log/rabbitmq/startup_err
         cat /var/log/rabbitmq/startup_log
     done
+
+    #br-int is required for OVS agent
+    brctl addbr br-int
 }
 
 upgrade_neutron_db () {