openstack/nova
Code Issues Proposed changes

Remove nova dependency on vconfig on Linux.

Browse Source 
iproute2 is already a dependency and is used everywhere and is more
capable than vconfig. This commit just replaces all uses of vconfig.

Change-Id: I5860a10f151a176bf9849feda6052d4c2b491e07
This commit is contained in:
Asbjørn Sannes 2011-10-20 11:27:23 +02:00
parent a6ac0bc245
commit 2463d9d185
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nova/network/linux_net.py
View File

@ -911,10 +911,9 @@ class LinuxBridgeInterfaceDriver(LinuxNetInterfaceDriver):
interface = 'vlan%s' % vlan_num
if not _device_exists(interface):
LOG.debug(_('Starting VLAN inteface %s'), interface)
_execute('vconfig', 'set_name_type',
'VLAN_PLUS_VID_NO_PAD', run_as_root=True)
_execute('vconfig', 'add', bridge_interface,
vlan_num, run_as_root=True)
_execute('ip', 'link', 'add', 'link', bridge_interface,
'name', interface, 'type', 'vlan',
'id', vlan_num, run_as_root=True)
# (danwent) the bridge will inherit this address, so we want to
# make sure it is the value set from the NetworkManager
if mac_address:

2
tools/clean-vlans
View File

@ -22,4 +22,4 @@ export LC_ALL=C
sudo ifconfig -a | grep br | grep -v bridge | cut -f1 -d" " | xargs -n1 -ifoo ifconfig foo down
sudo ifconfig -a | grep br | grep -v bridge | cut -f1 -d" " | xargs -n1 -ifoo brctl delbr foo
sudo ifconfig -a | grep vlan | cut -f1 -d" " | xargs -n1 -ifoo ifconfig foo down
sudo ifconfig -a | grep vlan | cut -f1 -d" " | xargs -n1 -ifoo vconfig rem foo
sudo ifconfig -a | grep vlan | cut -f1 -d" " | xargs -n1 -ifoo ip link del foo