Merge "Don't delete br-ex on upgrade in multinode jobs"
This commit is contained in:
commit
7b74e8b90e
|
@ -71,9 +71,16 @@ resources:
|
|||
let vni+=$subnode_index
|
||||
sed -i "s/vni/$vni/" /etc/os-net-config/config.json
|
||||
export interface_name="br-ex_$primary_private_ip"
|
||||
# Until we are fully migrated to os-net-config we need to clean
|
||||
# up the old bridge first created by devstack-gate
|
||||
ovs-vsctl del-br br-ex
|
||||
|
||||
# Until we are fully migrated to os-net-config we need
|
||||
# to clean up the old bridge first created by
|
||||
# devstack-gate. However, if $interface_name is already
|
||||
# present in `ovs-vsctl show`, assume our br-ex is
|
||||
# already configured. (Mainly for upgrade job, to avoid
|
||||
# deleting br-ex during upgrade.)
|
||||
if ! ovs-vsctl show | grep $interface_name &> /dev/null; then
|
||||
ovs-vsctl del-br br-ex
|
||||
fi
|
||||
}
|
||||
|
||||
-
|
||||
|
|
Loading…
Reference in New Issue