Skip to content

allow unmanaged NICs #1117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bmwiedemann wants to merge 2 commits into
base: master
Choose a base branch
from
+16 −12
Open

allow unmanaged NICs #1117

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8a9a4f
network: refactor nic cleanup
bmwiedemann Feb 23, 2017
46b856b
network: allow unmanaged network interfaces
bmwiedemann Feb 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions chef/cookbooks/network/recipes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,24 +119,28 @@ def kill_nic(nic)
# Ignore loopback interfaces for now.
return if nic.loopback?

Chef::Log.info("Interface #{nic.name} is no longer being used, deconfiguring it.")
nic.destroy

nicfiles = []
case node[:platform_family]
when "rhel"
# Redhat and Centos have lots of small files definining interfaces.
# Delete the ones we no longer care about here.
if ::File.exists?("/etc/sysconfig/network-scripts/ifcfg-#{nic.name}")
::File.delete("/etc/sysconfig/network-scripts/ifcfg-#{nic.name}")
end
nicfiles.push("/etc/sysconfig/network-scripts/ifcfg-#{nic.name}")
when "suse"
# SuSE also has lots of small files, but in slightly different locations.
if ::File.exists?("/etc/sysconfig/network/ifcfg-#{nic.name}")
::File.delete("/etc/sysconfig/network/ifcfg-#{nic.name}")
end
if ::File.exists?("/etc/sysconfig/network/ifroute-#{nic.name}")
::File.delete("/etc/sysconfig/network/ifroute-#{nic.name}")
end
nicfiles.push("/etc/sysconfig/network/ifcfg-#{nic.name}",
"/etc/sysconfig/network/ifroute-#{nic.name}")
end

# Ignore unmanaged interfaces
nicfiles.each do |file|
next unless ::File.exist?(file)
return nil if system("fgrep", "-q", "#unmanaged", file)
end
Chef::Log.info("Interface #{nic.name} is no longer being used, deconfiguring it.")
nic.destroy

nicfiles.each do |file|
::File.delete(file) if ::File.exist?(file)
end
end

Expand Down