From ae4ec147f2fea59b6d4b32f61e5439eded776c02 Mon Sep 17 00:00:00 2001 From: Yuvaraja Mariappan Date: Fri, 2 Dec 2016 12:04:14 -0800 Subject: [PATCH] Revert "fix for the dhcp issue when multiple ips are associated with vmi" This reverts commit 364ba77cfb34dc1c9d9c05a712c879aa5768c84b. Change-Id: I0a274297bdff8bf196b723b7f16142e04ce23c37 Partial-bug: 1645414 --- src/config/vnc_openstack/vnc_openstack/neutron_plugin_db.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/config/vnc_openstack/vnc_openstack/neutron_plugin_db.py b/src/config/vnc_openstack/vnc_openstack/neutron_plugin_db.py index f6bde1cd6fd..ce32e12be48 100644 --- a/src/config/vnc_openstack/vnc_openstack/neutron_plugin_db.py +++ b/src/config/vnc_openstack/vnc_openstack/neutron_plugin_db.py @@ -2239,10 +2239,7 @@ def _port_vnc_to_neutron(self, port_obj, port_req_memo=None): except NoIdError: continue - if ip_obj.get_instance_ip_secondary(): - continue - - if ip_obj.get_service_instance_ip(): + if ip_obj.get_service_instance_ip() and ip_obj.get_instance_ip_secondary(): continue if ip_obj.get_service_health_check_ip():