diff options
| -rwxr-xr-x | nova/network/linux_net.py | 7 | ||||
| -rwxr-xr-x | tools/clean-vlans | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index 46d520ade..099842979 100755 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -918,10 +918,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: diff --git a/tools/clean-vlans b/tools/clean-vlans index a26ad86ad..284e5dc57 100755 --- a/tools/clean-vlans +++ b/tools/clean-vlans @@ -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 |