openstack/fuel-library
Code Issues Proposed changes

Merge "Refactor l2/bond.pp manifest"

Browse Source
This commit is contained in:
Jenkins 2016-01-13 17:48:51 +00:00 committed by Gerrit Code Review
commit 0005edeeb2
2 changed files with 146 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
deployment/puppet/l23network/manifests/l2/bond.pp
View File

@ -9,13 +9,24 @@
# Bond name. # Bond name.
# #
# [*bridge*] # [*bridge*]
# Bridge that will contain this bond. Is only required for OVS bonds # Bridge that will contain this bond. Is only required for OVS bonds.
# #
# [*interfaces*] # [*interfaces*]
# List of interfaces in this bond. # List of interfaces in this bond.
# #
# [*bond_properties*]
# Bond configuration hash, supports below keys:
# mode
# miimon
# xmit_hash_policy - lnx provider only
# lacp - ovs provider only
# lacp_rate
# ad_select - lnx provider only
# updelay
# downdelay
#
# [*provider*] # [*provider*]
# This manifest supports lnx or ovs providers # This manifest supports lnx or ovs providers.
define l23network::l2::bond ( define l23network::l2::bond (
$ensure = present, $ensure = present,
@ -26,14 +37,11 @@ define l23network::l2::bond (
$mtu = undef, $mtu = undef,
$onboot = undef, $onboot = undef,
$delay_while_up = undef, $delay_while_up = undef,
# $ethtool = undef, $bond_properties = {},
$bond_properties = {}, # bond configuration options
$interface_properties = undef, # configuration options for included interfaces (mtu, ethtool, etc...) $interface_properties = undef, # configuration options for included interfaces (mtu, ethtool, etc...)
$vendor_specific = undef, $vendor_specific = undef,
$monolith_bond_providers = undef, $monolith_bond_providers = undef,
$provider = undef, $provider = undef,
# deprecated parameters, in the future ones will be moved to the vendor_specific hash
# $skip_existing = undef,
) { ) {
include ::stdlib include ::stdlib
include ::l23network::params include ::l23network::params
@ -66,105 +74,100 @@ define l23network::l2::bond (
'encap3+4' 'encap3+4'
] ]
$lacp_states = [
'off',
'passive',
'active'
]
$ad_select_states = [ $ad_select_states = [
'stable', 'stable',
'bandwidth', 'bandwidth',
'count' 'count'
] ]
# calculate string representation for bond_mode case $provider {
if ! $bond_properties[mode] { /ovs/: {
# default values by design http://openvswitch.org/support/dist-docs/ovs-vswitchd.conf.db.5.txt
$default_bond_properties = {
'mode' => 'active-backup',
'lacp' => 'off',
'lacp_rate' => 'slow',
}
# calculate lacp and lacp_rate
$lacp = pick($bond_properties[lacp], $default_bond_properties[lacp])
if $lacp != 'off' {
if is_integer($bond_properties[lacp_rate]) and $bond_properties[lacp_rate] < size($lacp_rates) {
$lacp_rate = $lacp_rates[$bond_properties[lacp_rate]]
} else {
# default value by design https://www.kernel.org/doc/Documentation/networking/bonding.txt # default value by design https://www.kernel.org/doc/Documentation/networking/bonding.txt
$bond_mode = $bond_modes[0] $lacp_rate = pick($bond_properties[lacp_rate], $default_bond_properties[lacp_rate])
} elsif is_integer($bond_properties[mode]) and $bond_properties[mode] < size($bond_modes) { }
}
$calculated_bond_properties = {
mode => pick($bond_properties[mode], $default_bond_properties[mode]),
lacp => $lacp,
lacp_rate => $lacp_rate,
}
}
default: {
# default values by design https://www.kernel.org/doc/Documentation/networking/bonding.txt
$default_bond_properties = {
'mode' => 'balance-rr',
'lacp_rate' => 'slow',
'xmit_hash_policy' => 'layer2',
'ad_select' => 'bandwidth',
}
# calculate mode
if is_integer($bond_properties[mode]) and $bond_properties[mode] < size($bond_modes) {
$bond_mode = $bond_modes[$bond_properties[mode]] $bond_mode = $bond_modes[$bond_properties[mode]]
} else { } else {
$bond_mode = $bond_properties[mode] $bond_mode = pick($bond_properties[mode], $default_bond_properties[mode])
} }
# init default bond properties hash # calculate xmit_hash_policy
$default_bond_properties = {
mode => $bond_mode,
}
# calculate string representation for xmit_hash_policy
if ( $bond_mode == '802.3ad' or $bond_mode == 'balance-xor' or $bond_mode == 'balance-tlb') { if ( $bond_mode == '802.3ad' or $bond_mode == 'balance-xor' or $bond_mode == 'balance-tlb') {
if ! $bond_properties[xmit_hash_policy] { if $bond_properties[xmit_hash_policy] {
# default value by design https://www.kernel.org/doc/Documentation/networking/bonding.txt $xmit_hash_policy = $bond_properties[xmit_hash_policy]
$default_bond_properties[xmit_hash_policy] = $xmit_hash_policies[0]
} else { } else {
$default_bond_properties[xmit_hash_policy] = $bond_properties[xmit_hash_policy] $xmit_hash_policy = $default_bond_properties[xmit_hash_policy]
} }
} else {
# non-lacp
$default_bond_properties[xmit_hash_policy] = undef
} }
# calculate string representation for lacp_rate # calculate lacp_rate
if $bond_mode == '802.3ad' or ($provider == 'ovs' and ( $bond_properties[lacp] == 'active' or $bond_properties[lacp] == 'passive')) { if $bond_mode == '802.3ad' {
if is_integer($bond_properties[lacp_rate]) and $bond_properties[lacp_rate] < size($lacp_rates) { if is_integer($bond_properties[lacp_rate]) and $bond_properties[lacp_rate] < size($lacp_rates) {
$default_bond_properties[lacp_rate] = $lacp_rates[$bond_properties[lacp_rate]] $lacp_rate = $lacp_rates[$bond_properties[lacp_rate]]
} else { } else {
# default value by design https://www.kernel.org/doc/Documentation/networking/bonding.txt $lacp_rate = pick($bond_properties[lacp_rate], $default_bond_properties[lacp_rate])
$default_bond_properties[lacp_rate] = pick($bond_properties[lacp_rate], $lacp_rates[0])
} }
if $provider == 'ovs' {
$default_bond_properties[lacp] = $bond_properties[lacp]
} else {
$default_bond_properties[lacp] = undef
}
} else {
$default_bond_properties[lacp_rate] = undef
$default_bond_properties[lacp] = undef
} }
# calculate default miimon # calculate ad_select
if is_integer($bond_properties[miimon]) and $bond_properties[miimon] >= 0 {
$default_bond_properties[miimon] = $bond_properties[miimon]
} else {
# recommended default value https://www.kernel.org/doc/Documentation/networking/bonding.txt
$default_bond_properties[miimon] = 100
}
# calculate default updelay
if is_integer($bond_properties[updelay]) and $bond_properties[updelay] >= 0 {
$default_bond_properties[updelay] = $bond_properties[updelay]
} else {
$default_bond_properties[updelay] = 200
}
# calculate default downdelay
if is_integer($bond_properties[downdelay]) and $bond_properties[downdelay] >= 0 {
$default_bond_properties[downdelay] = $bond_properties[downdelay]
} else {
$default_bond_properties[downdelay] = 200
}
# calculate default ad_select
if $bond_properties[ad_select] {
if is_integer($bond_properties[ad_select]) { if is_integer($bond_properties[ad_select]) {
$default_bond_properties[ad_select] = $ad_select_states[$bond_properties[ad_select]] $ad_select = $ad_select_states[$bond_properties[ad_select]]
} else { } else {
$default_bond_properties[ad_select] = $bond_properties[ad_select] $ad_select = pick($bond_properties[ad_select], $default_bond_properties[ad_select])
}
} else {
$default_bond_properties[ad_select] = $ad_select_states[1]
} }
$real_bond_properties = merge($bond_properties, $default_bond_properties) $calculated_bond_properties = {
mode => $bond_mode,
xmit_hash_policy => $xmit_hash_policy,
lacp_rate => $lacp_rate,
ad_select => $ad_select,
}
}
}
$real_bond_properties = merge($calculated_bond_properties, { miimon => pick($bond_properties[miimon], 100 ),
updelay => pick($bond_properties[updelay], 200 ),
downdelay => pick($bond_properties[downdelay], 200 )})
if $interfaces { if $interfaces {
validate_array($interfaces) validate_array($interfaces)
} }
if $delay_while_up and ! is_numeric($delay_while_up) { if $delay_while_up and ! is_numeric($delay_while_up) {
fail("Delay for waiting after UP interface ${port} should be numeric, not an '$delay_while_up'.") fail("Delay for waiting after UP interface ${port} should be numeric, not an ${delay_while_up}.")
} }
if ! $bridge and $provider == 'ovs' { if ! $bridge and $provider == 'ovs' {
@ -181,18 +184,18 @@ define l23network::l2::bond (
if member($actual_monolith_bond_providers, $actual_provider_for_bond_interface) { if member($actual_monolith_bond_providers, $actual_provider_for_bond_interface) {
# just interfaces in UP state should be presented # just interfaces in UP state should be presented
l23network::l2::bond_interface{ $interfaces: l23network::l2::bond_interface{ $interfaces:
ensure => $ensure,
bond => $bond, bond => $bond,
bond_is_master => false, bond_is_master => false,
mtu => $mtu, mtu => $mtu,
interface_properties => $interface_properties, interface_properties => $interface_properties,
ensure => $ensure,
} }
} else { } else {
l23network::l2::bond_interface{ $interfaces: l23network::l2::bond_interface{ $interfaces:
ensure => $ensure,
bond => $bond, bond => $bond,
mtu => $mtu, mtu => $mtu,
interface_properties => $interface_properties, interface_properties => $interface_properties,
ensure => $ensure,
provider => $actual_provider_for_bond_interface provider => $actual_provider_for_bond_interface
} }
} }
@ -261,7 +264,7 @@ define l23network::l2::bond (
ensure => present, ensure => present,
owner => 'root', owner => 'root',
mode => '0755', mode => '0755',
content => template("l23network/centos_post_up.erb"), content => template('l23network/centos_post_up.erb'),
} -> L23_stored_config <| title == $bond |> } -> L23_stored_config <| title == $bond |>
} else { } else {
file {"${::l23network::params::interfaces_dir}/interface-up-script-${bond}": file {"${::l23network::params::interfaces_dir}/interface-up-script-${bond}":

52
deployment/puppet/l23network/spec/defines/l2_bond__spec.rb
View File

@ -38,6 +38,8 @@ describe 'l23network::l2::bond', :type => :define do
'bond_mode' => 'balance-rr', 'bond_mode' => 'balance-rr',
'bond_slaves' => ['eth3', 'eth4'], 'bond_slaves' => ['eth3', 'eth4'],
'bond_miimon' => '100', 'bond_miimon' => '100',
'bond_updelay' => '200',
'bond_downdelay' => '200',
}) })
end end
@ -63,6 +65,53 @@ describe 'l23network::l2::bond', :type => :define do
end end
end end
context 'Just create a ovs-bond with two slave interfaces' do
let(:params) do
{
:name => 'ovs-bond0',
:bridge => 'br-ovs-bond0',
:interfaces => ['eth31', 'eth41'],
:bond_properties => {},
:provider => 'ovs'
}
end
it do
should compile.with_all_deps
end
it do
should contain_l23_stored_config('ovs-bond0').with({
'ensure' => 'present',
'if_type' => 'bond',
'bond_mode' => 'active-backup',
'bond_slaves' => ['eth31', 'eth41'],
'bond_miimon' => '100',
'bond_updelay' => '200',
'bond_downdelay' => '200',
})
end
['eth31', 'eth41'].each do |slave|
it do
should contain_l23_stored_config(slave).with({
'ensure' => 'present',
'if_type' => nil,
})
end
it do
should contain_l2_port(slave)
end
it do
should contain_l2_port(slave).with({
'ensure' => 'present',
}).that_requires("L23_stored_config[#{slave}]")
end
end
end
context 'Just create a lnx-bond with two vlan subinterfaces as slave interfaces' do context 'Just create a lnx-bond with two vlan subinterfaces as slave interfaces' do
let(:params) do let(:params) do
{ {
@ -339,7 +388,6 @@ describe 'l23network::l2::bond', :type => :define do
'bond_miimon' => '300', 'bond_miimon' => '300',
'bond_updelay' => '200', 'bond_updelay' => '200',
'bond_downdelay' => '200', 'bond_downdelay' => '200',
'bond_ad_select' => 'bandwidth',
}) })
should contain_l23_stored_config('bond-ovs').without_bond_xmit_hash_policy() should contain_l23_stored_config('bond-ovs').without_bond_xmit_hash_policy()
end end
@ -351,10 +399,8 @@ describe 'l23network::l2::bond', :type => :define do
:lacp => 'active', :lacp => 'active',
:lacp_rate => 'fast', :lacp_rate => 'fast',
:miimon => '300', :miimon => '300',
:xmit_hash_policy => :undef,
:updelay =>"200", :updelay =>"200",
:downdelay =>"200", :downdelay =>"200",
:ad_select =>"bandwidth",
}, },
}) })
end end