openstack/ironic
Code Issues Proposed changes

Delete bridge "brbm" in devstack/unstack.sh

Browse Source 
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
This commit is contained in:
Yuiko Takada 2016-03-17 17:54:59 +09:00
parent cb1a83f740
commit 16414716ca
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/lib/ironic
View File

@ -988,9 +988,11 @@ function cleanup_baremetal_basic_ops {
local vm_name local vm_name
for vm_name in $(_ironic_bm_vm_names); do 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 done
sudo ovs-vsctl --if-exists del-br $IRONIC_VM_NETWORK_BRIDGE
sudo rm -rf /etc/xinetd.d/tftp /etc/init/tftpd-hpa.override sudo rm -rf /etc/xinetd.d/tftp /etc/init/tftpd-hpa.override
restart_service xinetd restart_service xinetd
sudo iptables -D INPUT -d $HOST_IP -p udp --dport 69 -j ACCEPT || true sudo iptables -D INPUT -d $HOST_IP -p udp --dport 69 -j ACCEPT || true

2
devstack/tools/ironic/scripts/cleanup-node.sh
View File

@ -11,7 +11,6 @@ LIBVIRT_STORAGE_POOL=${LIBVIRT_STORAGE_POOL:-"default"}
LIBVIRT_CONNECT_URI=${LIBVIRT_CONNECT_URI:-"qemu:///system"} LIBVIRT_CONNECT_URI=${LIBVIRT_CONNECT_URI:-"qemu:///system"}
NAME=$1 NAME=$1
NETWORK_BRIDGE=$2
export VIRSH_DEFAULT_CONNECT_URI=$LIBVIRT_CONNECT_URI export VIRSH_DEFAULT_CONNECT_URI=$LIBVIRT_CONNECT_URI
@ -30,6 +29,5 @@ if virsh pool-list | grep -q $LIBVIRT_STORAGE_POOL ; then
fi fi
sudo brctl delif br-$NAME ovs-$NAME || true 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 ip link set dev br-$NAME down || true
sudo brctl delbr br-$NAME || true sudo brctl delbr br-$NAME || true