]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Merge "Remove use_namespaces from RouterInfo Property"
authorJenkins <jenkins@review.openstack.org>
Mon, 27 Oct 2014 09:49:00 +0000 (09:49 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 27 Oct 2014 09:49:00 +0000 (09:49 +0000)
1  2 
neutron/agent/l3_agent.py
neutron/tests/unit/test_l3_agent.py

Simple merge
index df362342d7f2d621fb7330ddb6e91e274ae85a35,44e82d3181660195a171b025fad27cadff462010..62808190858bac08e4d39990cc1af6d5c7a074d6
@@@ -2188,9 -2177,8 +2178,9 @@@ vrrp_instance VR_1 
          fip_cidr = '11.22.33.44/24'
  
          ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
-                                  self.conf.use_namespaces, router=router)
+                                  router=router)
          ri.dist_fip_count = 2
 +        agent.fip_ns_subscribers.add(ri.router_id)
          ri.floating_ips_dict['11.22.33.44'] = FIP_PRI
          ri.fip_2_rtr = '11.22.33.42'
          ri.rtr_2_fip = '11.22.33.40'