openstack/tripleo-image-elements
Code Issues Proposed changes

Merge "ensure-bridge: bring up bridges first on Debian"

Browse Source
This commit is contained in:
Jenkins 2014-07-09 05:40:56 +00:00 committed by Gerrit Code Review
commit 152e83b37d
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,16 +145,6 @@ function configure_bridge_interface_dhcp_eni() {
sed -e "/auto $interface\$/,/^$/d" -i $tmp_config
sed -e "/auto $bridge\$/,/^$/d" -i $tmp_config
#interface config
cat >> $tmp_config <<-EOF_CAT
auto $interface
allow-$bridge $interface
iface $interface inet manual
ovs_bridge $bridge
ovs_type OVSPort
EOF_CAT
#bridge config
if [ -z "$bridge_ip_addr" ]; then
cat >> $tmp_config <<EOF_CAT
@ -179,6 +169,16 @@ iface $bridge inet static
EOF_CAT
fi
#interface config
cat >> $tmp_config <<-EOF_CAT
auto $interface
allow-$bridge $interface
iface $interface inet manual
ovs_bridge $bridge
ovs_type OVSPort
EOF_CAT
if ! diff $tmp_config $config &>/dev/null; then
ifdown $interface &>/dev/null || true
ifdown $bridge &>/dev/null || true