openstack/fuel-library
Code Issues Proposed changes

Add check for vlan usage existing

Browse Source 
Fuel-CI: disable
Related-bug: #1460972
Change-Id: I4dcdfba3ae0a5ac344a6a63e1dbaadc93e95ea8d
This commit is contained in:
Sergey Vasilenko 2015-06-02 12:29:40 +03:00
parent d757cd41e4
commit 5bd0333f51
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
deployment/puppet/l23network/lib/puppet/provider/l2_base.rb
View File

@ -38,14 +38,16 @@ class Puppet::Provider::L2_base < Puppet::Provider
# }
#
vlan_ifaces = {}
rc_c = /([\w+\.\-]+)\s*\|\s*(\d+)\s*\|\s*([\w+\-]+)/
File.open("/proc/net/vlan/config", "r").each do |line|
if (rv=line.match(rc_c))
vlan_ifaces[rv[1]] = {
:vlan_dev => rv[3],
:vlan_id => rv[2],
:vlan_mode => (rv[1].match('\.').nil? ? 'vlan' : 'eth' )
}
if File.exist? '/proc/net/vlan'
rc_c = /([\w+\.\-]+)\s*\|\s*(\d+)\s*\|\s*([\w+\-]+)/
File.open("/proc/net/vlan/config", "r").each do |line|
if (rv=line.match(rc_c))
vlan_ifaces[rv[1]] = {
:vlan_dev => rv[3],
:vlan_id => rv[2],
:vlan_mode => (rv[1].match('\.').nil? ? 'vlan' : 'eth' )
}
end
end
end
return vlan_ifaces