From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 18 Jun 2015 07:12:42 +0000 (+0000)
Subject: Merge "Add devices to update in RPC call security_groups_provider_updated"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3454c87034e13655f2ab5489530cf0437cda66f4;p=openstack-build%2Fneutron-build.git

Merge "Add devices to update in RPC call security_groups_provider_updated"
---

3454c87034e13655f2ab5489530cf0437cda66f4
diff --cc neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
index d93560b07,8185d4d88..befa561bf
--- a/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
+++ b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
@@@ -122,9 -117,10 +122,10 @@@ class OVSNeutronAgent(sg_rpc.SecurityGr
      #   1.0 Initial version
      #   1.1 Support Security Group RPC
      #   1.2 Support DVR (Distributed Virtual Router) RPC
-     target = oslo_messaging.Target(version='1.2')
+     #   1.3 Added param devices_to_update to security_groups_provider_updated
+     target = oslo_messaging.Target(version='1.3')
  
 -    def __init__(self, integ_br, tun_br, local_ip,
 +    def __init__(self, bridge_classes, integ_br, tun_br, local_ip,
                   bridge_mappings, polling_interval, tunnel_types=None,
                   veth_mtu=None, l2_population=False,
                   enable_distributed_routing=False,