Bug 3738: GBP coexistence fixes

[groupbasedpolicy.git] / demos / gbp-devstack / devstack-scripts / restack.sh

diff --git a/demos/gbp-devstack/devstack-scripts/restack.sh b/demos/gbp-devstack/devstack-scripts/restack.sh
index 469e200a260e37a95a49f0f4a5a32a5a8ef5af0c..41c647a26bfff70514dc31da396016dfdd2bfcf5 100755 (executable)
--- a/demos/gbp-devstack/devstack-scripts/restack.sh
+++ b/demos/gbp-devstack/devstack-scripts/restack.sh
@@ -1,11 +1,13 @@
 ./unstack.sh --all
 
- sudo service rabbitmq-server restart
- sudo service mysql restart
+rm /home/vagrant/sfc*lock
+
+sudo service rabbitmq-server restart
+sudo service mysql restart
 
 sudo ovs-vsctl set-manager tcp:$ODL:6640
 sudo ovs-vsctl add-br br-int
-sudo ovs-vsctl set-controller tcp:$ODL:6653
+sudo ovs-vsctl set-controller br-int tcp:$ODL:6653
 
 echo "Removing all logs to save space..."
 sudo rm -rf /opt/stack/logs/*