From: Eugene Nikanorov Date: Thu, 30 May 2013 08:25:16 +0000 (+0400) Subject: Fix pool update error in lbaas X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3786f3ab2028b18e427569ee0824cdbb85e91c55;p=openstack-build%2Fneutron-build.git Fix pool update error in lbaas fixes bug 1185687 Do not notify namespace agent of modified pool if pool doesn't have vip Change-Id: Ibe3399aaa145d19fc758f08adb51c7ffefa5bb3a --- diff --git a/quantum/plugins/services/agent_loadbalancer/plugin.py b/quantum/plugins/services/agent_loadbalancer/plugin.py index c891873da..b29f1e771 100644 --- a/quantum/plugins/services/agent_loadbalancer/plugin.py +++ b/quantum/plugins/services/agent_loadbalancer/plugin.py @@ -275,7 +275,8 @@ class LoadBalancerPlugin(loadbalancer_db.LoadBalancerPluginDb): pool['pool']['status'] = constants.PENDING_UPDATE p = super(LoadBalancerPlugin, self).update_pool(context, id, pool) if p['status'] in ACTIVE_PENDING: - self.agent_rpc.reload_pool(context, p['id']) + if p['vip_id'] is not None: + self.agent_rpc.reload_pool(context, p['id']) else: self.agent_rpc.destroy_pool(context, p['id']) return p