From 0d012d265c30a9ffd36064d74bcebe7cf8f050d0 Mon Sep 17 00:00:00 2001 From: Stanislav Makar Date: Wed, 10 Feb 2016 13:02:16 +0000 Subject: [PATCH] Fix idempotency with mtu for lnx l2_port and l2_bond If mtu = 1500 it means that it is :absent Change-Id: Id05a5e5b5c2d98558cd717eb48444a530dd727fd Related-Blueprint: granular-task-idempotency --- deployment/puppet/l23network/lib/puppet/provider/l2_base.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deployment/puppet/l23network/lib/puppet/provider/l2_base.rb b/deployment/puppet/l23network/lib/puppet/provider/l2_base.rb index d977577ed8..0f05da9f3c 100644 --- a/deployment/puppet/l23network/lib/puppet/provider/l2_base.rb +++ b/deployment/puppet/l23network/lib/puppet/provider/l2_base.rb @@ -66,6 +66,7 @@ class Puppet::Provider::L2_base < Puppet::Provider::InterfaceToolset :mtu => File.open("#{if_dir}/mtu").read.chomp.to_i, :provider => (if_name == 'ovs-system') ? 'ovs' : 'lnx' , } + port[if_name][:mtu] = :absent if port[if_name][:mtu] == 1500 # determine port_type for this iface peer_ifindex = self.get_iface_peer_index(if_name) if !peer_ifindex.nil? @@ -513,6 +514,7 @@ class Puppet::Provider::L2_base < Puppet::Provider::InterfaceToolset :downdelay => File.open("/sys/class/net/#{bond_name}/bonding/downdelay").read.chomp, } } + bond[bond_name][:mtu] = :absent if port[if_name][:mtu] == 1500 if ['802.3ad', 'balance-xor', 'balance-tlb', 'balance-alb'].include? mode xmit_hash_policy = File.open("/sys/class/net/#{bond_name}/bonding/xmit_hash_policy").read.split(/\s+/)[0] bond[bond_name][:bond_properties][:xmit_hash_policy] = xmit_hash_policy