Commit 38790036 by Thomas Parrott

network: Updates instantiate_veth to support OVS VLAN setup

parent 8f7c3358
...@@ -624,7 +624,14 @@ static int instantiate_veth(struct lxc_handler *handler, struct lxc_netdev *netd ...@@ -624,7 +624,14 @@ static int instantiate_veth(struct lxc_handler *handler, struct lxc_netdev *netd
} }
INFO("Attached \"%s\" to bridge \"%s\"", veth1, netdev->link); INFO("Attached \"%s\" to bridge \"%s\"", veth1, netdev->link);
if (!is_ovs_bridge(netdev->link)) { if (is_ovs_bridge(netdev->link)) {
err = setup_veth_ovs_bridge_vlan(veth1, netdev);
if (err) {
SYSERROR("Failed to setup openvswitch bridge vlan on \"%s\"", veth1);
lxc_ovs_delete_port(netdev->link, veth1);
goto out_delete;
}
} else {
err = setup_veth_native_bridge_vlan(veth1, netdev); err = setup_veth_native_bridge_vlan(veth1, netdev);
if (err) { if (err) {
SYSERROR("Failed to setup native bridge vlan on \"%s\"", veth1); SYSERROR("Failed to setup native bridge vlan on \"%s\"", veth1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment