[3.0] network: Set MTU for VLAN parent interface (bsc#1024279) #1241
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If a physical interface has VLAN(s) configured with a custom MTU set but the underlying physical network is not used directly and has no MTU in its config, use the MTU from the VLAN interface for the parent device. If there are multiple VLANs, use the highest MTU for the parent. Also, if the physical parent from a VLAN interface is configured but the MTU is lower than one of its VLAN interfaces, abort the chef-client run and raise a useful error message. (cherry picked from commit fc4152d)
houndci-bot
reviewed
Jun 5, 2017
| parent_nic = Nic.new(nic.parent) | ||
| Chef::Log.info("vlan #{nic.name} wants mtu #{ifs[nic.name]["mtu"]} but " \ | ||
| "parent #{parent_nic.name} wants no/lower mtu. Set mtu "\ | ||
| "for #{parent_nic.name} to #{ifs[nic.parent]['mtu']}") |
There was a problem hiding this comment.
Style/StringLiteralsInInterpolation: Prefer double-quoted strings inside interpolations. (https://github.com/SUSE/style-guides/blob/master/Ruby.md#stylestringliteralsininterpolation)
| end | ||
| end | ||
| # 2) set the mtu for the parent if needed | ||
| if !ifs[nic.parent].key? "mtu" || (ifs[nic.parent]["mtu"].to_i < ifs[nic.name]["mtu"].to_i) |
There was a problem hiding this comment.
Style/NegatedIf: Favor unless over if for negative conditions. (https://github.com/bbatsov/ruby-style-guide#unless-for-negatives)
Lint/RequireParentheses: Use parentheses in the method call to avoid confusion about precedence.
| networks_using_parent = if_mapping.select { |net, ifaces| ifaces.include? nic.parent }.keys | ||
| networks_using_parent.each do |net_name| | ||
| net = Barclamp::Inventory.get_network_by_type(node, net_name) | ||
| unless net.use_vlan |
There was a problem hiding this comment.
Style/Next: Use next to skip iteration. (https://github.com/bbatsov/ruby-style-guide#no-nested-conditionals)
nicolasbock
approved these changes
Jun 5, 2017
vuntz
approved these changes
Jun 28, 2017
|
@Itxaka mkcloud failed here, I guess this should be triggered again. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If a physical interface has VLAN(s) configured with a custom MTU set but
the underlying physical network is not used directly and has no MTU in
its config, use the MTU from the VLAN interface for the parent device.
If there are multiple VLANs, use the highest MTU for the parent.
Also, if the physical parent from a VLAN interface is configured but the
MTU is lower than one of its VLAN interfaces, abort the chef-client run
and raise a useful error message.
(cherry picked from commit fc4152d)
Backported as requested on #1230 by @vuntz