openstack
/
ironic-inspector
Code Issues Proposed changes

[devstack] Remove bridge only if it's not OVB_PHYSICAL_BRIDGE 

In a scenario we want to deploy DevStack with ironic inspector for real
hardware and use OVS_PHYSICAL_BRIDGE for IRONIC_INSPECTOR_INTERFACE as
well we dont need to issue interface delete.

Change-Id: I45271ddc34b5e9d542b6a1499d698503717f5f03
This commit is contained in:
Noam Angel 2017-01-22 08:34:21 +02:00
parent 59a20098f1
commit c4cbfa7723
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/plugin.sh
View File

@ -296,7 +296,9 @@ function cleanup_inspector {
sudo iptables -F ironic-inspector | true
sudo iptables -X ironic-inspector | true
sudo ip link show $IRONIC_INSPECTOR_INTERFACE && sudo ip link delete $IRONIC_INSPECTOR_INTERFACE
if [[ $IRONIC_INSPECTOR_INTERFACE != $OVS_PHYSICAL_BRIDGE ]]; then
sudo ip link show $IRONIC_INSPECTOR_INTERFACE && sudo ip link delete $IRONIC_INSPECTOR_INTERFACE
fi
sudo ip link show brbm-inspector && sudo ip link delete brbm-inspector
sudo ovs-vsctl --if-exists del-port brbm-inspector
}