From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 20 Nov 2015 22:13:05 +0000 (+0000)
Subject: Merge "Add vhost-user support via ovs capabilities/datapath_type"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b97fbb2aa5e40057a3dfd1e976849787db792a88;p=openstack-build%2Fneutron-build.git

Merge "Add vhost-user support via ovs capabilities/datapath_type"
---

b97fbb2aa5e40057a3dfd1e976849787db792a88
diff --cc neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
index ea51b95af,3a5476d72..2b9adc5aa
--- a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
+++ b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
@@@ -181,8 -181,8 +181,9 @@@ class OVSNeutronAgent(sg_rpc.SecurityGr
          '''
          super(OVSNeutronAgent, self).__init__()
          self.conf = conf or cfg.CONF
+         self.ovs = ovs_lib.BaseOVS()
  
 +        self.fullsync = True
          # init bridge classes with configured datapath type.
          self.br_int_cls, self.br_phys_cls, self.br_tun_cls = (
              functools.partial(bridge_classes[b],