network: Updates instantiate_veth to support OVS VLAN setup

Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>

diff --git a/src/lxc/network.c b/src/lxc/network.c
index 077eb7de1ca4772aebd4e8b37c869c684d4c55dc..2ff053ecaec00864e6ccbb94717892bb45921d54 100644 (file)
--- a/src/lxc/network.c
+++ b/src/lxc/network.c
@@ -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);
 
-               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);
                        if (err) {
                                SYSERROR("Failed to setup native bridge vlan on \"%s\"", veth1);