From 0be10542199c7c212a0d8c377a86aec067d53435 Mon Sep 17 00:00:00 2001 From: Roger Luethi Date: Thu, 28 Aug 2014 11:03:20 +0200 Subject: [PATCH] labs: fix ovs-vsctl error By the time we try to create the internal bridge on compute and network nodes, they have already been created, resulting in an error message. This patch informs ovs-vsctl that the bridge may already exist. Change-Id: Ib1b951f639d208b98769f28a66d0edff27ae6224 --- labs/scripts/setup_neutron_compute.sh | 2 +- labs/scripts/setup_neutron_network.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/labs/scripts/setup_neutron_compute.sh b/labs/scripts/setup_neutron_compute.sh index 3cb22b5c..76b52af0 100755 --- a/labs/scripts/setup_neutron_compute.sh +++ b/labs/scripts/setup_neutron_compute.sh @@ -76,7 +76,7 @@ echo "Restarting the Open vSwitch (OVS) service." sudo service openvswitch-switch restart echo "Adding the integration bridge." -sudo ovs-vsctl add-br br-int +sudo ovs-vsctl --may-exist add-br br-int echo "Configuring Compute to use Networking." conf=/etc/nova/nova.conf diff --git a/labs/scripts/setup_neutron_network.sh b/labs/scripts/setup_neutron_network.sh index ea91d1c7..e8e2b889 100755 --- a/labs/scripts/setup_neutron_network.sh +++ b/labs/scripts/setup_neutron_network.sh @@ -77,7 +77,7 @@ echo "Restarting the Open vSwitch (OVS) service." sudo service openvswitch-switch restart echo "Adding the integration bridge." -sudo ovs-vsctl add-br br-int +sudo ovs-vsctl --may-exist add-br br-int echo "Adding the external bridge" sudo ovs-vsctl add-br br-ex