openstack
/
tripleo-image-elements
Code Issues Proposed changes

Ensure-bridge duplicates allow-$bridge stanza 

Ensure-bridge is missing a sed to clean-up the allow-$bridge stanza before
re-configuring. This means 1) the stanza gets duplicated, 2) the network is
reset every time ensure-bridge runs.

Co-Authored-By: alexisl@hp.com

Change-Id: If3339a4f70bf77be2d7eb11100147c209c7ec870
This commit is contained in:
Nicholas Randon 2015-01-07 09:33:15 +00:00
parent 0d3786ec58
commit e4d3fccb1b
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/network-utils/bin/ensure-bridge
View File

@ -225,6 +225,7 @@ function configure_bridge_interface_dhcp_eni() {
sed -e "/auto $interface\$/,/^$/d" -i $tmp_config
sed -e "/allow-ovs $bridge\$/,/^$/d" -i $tmp_config
sed -e "/auto int_public\$/,/^$/d" -i $tmp_config
sed -e "/allow-$bridge $interface\$/,/^$/d" -i $tmp_config
if [ -n "$bridge_route_prefix" ]; then
local route_line="post-up ip route replace $bridge_route_prefix via $bridge_route_via"
@ -275,6 +276,7 @@ iface int_public inet static
ovs_bridge $bridge
ovs_type OVSIntPort
ovs_options tag=$public_tag
EOF_CAT
fi