openstack/tripleo-heat-templates
Code Issues Proposed changes

Don't delete br-ex on upgrade in multinode jobs

Browse Source 
The hook for os-net-config in multinode NIC config templates contains
a call to `ovs-vsctl del-br br-ex` to remove the bridge we got from
nodepool and initialize network config. We need to avoid executing
that again on upgrade, or the Ansible process running the upgrade gets
stuck.

Change-Id: Ie36342402426d74fd528e320d60adc951bf8c9ac
Closes-Bug: #1772040
This commit is contained in:
Jiri Stransky 2018-05-21 13:26:05 +02:00
parent 51f9c5c52e
commit e9e2b4d104
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ci/common/net-config-multinode-os-net-config.yaml
View File

@ -71,9 +71,16 @@ resources:
let vni+=$subnode_index let vni+=$subnode_index
sed -i "s/vni/$vni/" /etc/os-net-config/config.json sed -i "s/vni/$vni/" /etc/os-net-config/config.json
export interface_name="br-ex_$primary_private_ip" 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 # Until we are fully migrated to os-net-config we need
ovs-vsctl del-br br-ex # 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
} }
- -