openstack/fuel-library
Code Issues Proposed changes

Executing IFUP operation

Browse Source 
for master-bond interface should be after UPping at least one slave interface

Change-Id: I3aabebd37d77dced39c9b77a834c179dbc65e2b3
Closes-Bug: #1310661
This commit is contained in:
Sergey Vasilenko 2014-04-21 19:06:10 +04:00 committed by Gerrit Code Review
parent 8b68888bd5
commit 71ef7d46ef
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deployment/puppet/l23network/manifests/l3/ifconfig.pp
View File

@ -110,7 +110,7 @@ define l23network::l3::ifconfig (
include ::l23network::params include ::l23network::params
$bond_properties_defaults = { $bond_properties_defaults = {
mode => 1, mode => 0,
miimon => 100, miimon => 100,
lacp_rate => 1, lacp_rate => 1,
} }
@ -339,12 +339,20 @@ define l23network::l3::ifconfig (
content => template("l23network/ipconfig_${::osfamily}_${method}.erb"), content => template("l23network/ipconfig_${::osfamily}_${method}.erb"),
} }
# bond master interface should be upped only after including at least one slave interface to one
if $interface =~ /^(bond\d+)/ {
$l3_if_downup__subscribe = undef
File["$interface_file"] -> L3_if_downup["$interface"]
L3_if_downup<| $bond_master == $interface |> ~> L3_if_downup["$interface"]
} else {
$l3_if_downup__subscribe = File["$interface_file"]
}
notify {"ifconfig_${interface}": message=>"Interface:${interface} IP:${effective_ipaddr}/${effective_netmask}", withpath=>false} -> notify {"ifconfig_${interface}": message=>"Interface:${interface} IP:${effective_ipaddr}/${effective_netmask}", withpath=>false} ->
l3_if_downup {"$interface": l3_if_downup {"$interface":
check_by_ping => $check_by_ping, check_by_ping => $check_by_ping,
check_by_ping_timeout => $check_by_ping_timeout, check_by_ping_timeout => $check_by_ping_timeout,
#require => File["$interface_file"], ## do not enable it!!! It affect requirements interface from interface in some cases. #require => File["$interface_file"], ## do not enable it!!! It affect requirements interface from interface in some cases.
subscribe => File["$interface_file"], subscribe => $l3_if_downup__subscribe,
refreshonly => true, refreshonly => true,
} }