From 16414716ca9293d96bbcc491e64c686f711ad828 Mon Sep 17 00:00:00 2001 From: Yuiko Takada Date: Thu, 17 Mar 2016 17:54:59 +0900 Subject: [PATCH] Delete bridge "brbm" in devstack/unstack.sh Virtual bridge "brbm" which has been created by devstack isn't removed by devstack/unstack.sh. This patch fix that devstack/unstack.sh removes virtual bridge which has been created by devstack. Change-Id: I40da4915de546c48a59fe270e51d1e8f1d4d27b9 Closes-bug: #1558439 --- devstack/lib/ironic | 4 +++- devstack/tools/ironic/scripts/cleanup-node.sh | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 9417648bf9..1be0fe3303 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -988,9 +988,11 @@ function cleanup_baremetal_basic_ops { local vm_name for vm_name in $(_ironic_bm_vm_names); do - sudo su $STACK_USER -c "$IRONIC_SCRIPTS_DIR/cleanup-node.sh $vm_name $IRONIC_VM_NETWORK_BRIDGE" + sudo su $STACK_USER -c "$IRONIC_SCRIPTS_DIR/cleanup-node.sh $vm_name" done + sudo ovs-vsctl --if-exists del-br $IRONIC_VM_NETWORK_BRIDGE + sudo rm -rf /etc/xinetd.d/tftp /etc/init/tftpd-hpa.override restart_service xinetd sudo iptables -D INPUT -d $HOST_IP -p udp --dport 69 -j ACCEPT || true diff --git a/devstack/tools/ironic/scripts/cleanup-node.sh b/devstack/tools/ironic/scripts/cleanup-node.sh index 60cd39a3c4..0fa9e25bbb 100755 --- a/devstack/tools/ironic/scripts/cleanup-node.sh +++ b/devstack/tools/ironic/scripts/cleanup-node.sh @@ -11,7 +11,6 @@ LIBVIRT_STORAGE_POOL=${LIBVIRT_STORAGE_POOL:-"default"} LIBVIRT_CONNECT_URI=${LIBVIRT_CONNECT_URI:-"qemu:///system"} NAME=$1 -NETWORK_BRIDGE=$2 export VIRSH_DEFAULT_CONNECT_URI=$LIBVIRT_CONNECT_URI @@ -30,6 +29,5 @@ if virsh pool-list | grep -q $LIBVIRT_STORAGE_POOL ; then fi sudo brctl delif br-$NAME ovs-$NAME || true -sudo ovs-vsctl del-port $NETWORK_BRIDGE ovs-$NAME || true sudo ip link set dev br-$NAME down || true sudo brctl delbr br-$NAME || true