openstack
/
fuel-library
Code Issues Proposed changes

Do not try change default route obtained via DHCP. 

When DHCP is used to configure a network interface we must ignore
gateway settings so that the default route doesn't get deleted when
gateway settings are absent (which is reasonable for DHCP).

Change-Id: I94f7fb903ce2f271ad14329f353202ca7251915c
Closes-Bug: #1543767
This commit is contained in:
Georgy Kibardin 2016-03-21 10:36:09 +03:00
parent eb22a92462
commit c5c67262b5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deployment/puppet/l23network/lib/puppet/provider/l3_ifconfig/lnx.rb
View File

@ -66,12 +66,13 @@ Puppet::Type.type(:l3_ifconfig).provide(:lnx, :parent => Puppet::Provider::L3_ba
if ! @property_flush.empty?
debug("FLUSH properties: #{@property_flush}")
# FLUSH changed properties
is_dhcp = @property_flush[:ipaddr].to_s.downcase == 'dhcp'
if ! @property_flush[:ipaddr].nil?
if @property_flush[:ipaddr].include?(:absent)
# flush all ip addresses from interface
self.class.addr_flush(@resource[:interface], true)
#todo(sv): check for existing dhclient for this interface and kill it
elsif (@property_flush[:ipaddr] & [:dhcp, 'dhcp', 'DHCP']).any?
elsif is_dhcp
# start dhclient on interface the same way as at boot time
ifdown(@resource[:interface])
sleep(5)
@ -160,7 +161,7 @@ Puppet::Type.type(:l3_ifconfig).provide(:lnx, :parent => Puppet::Provider::L3_ba
end
end
if !@property_flush[:gateway].nil? or !@property_flush[:gateway_metric].nil?
if !is_dhcp and (!@property_flush[:gateway].nil? or !@property_flush[:gateway_metric].nil?)
# clean all default gateways for *THIS* interface (with any metrics)
cmdline = ['route', 'del', 'default', 'dev', @resource[:interface]]