From f1a58c31dea16268d64b017adefa12f4ddeb51b6 Mon Sep 17 00:00:00 2001 From: Yuvaraja Mariappan Date: Fri, 2 Dec 2016 12:06:48 -0800 Subject: [PATCH] Revert "fix for the dhcp issue when multiple ips are associated with vmi" This reverts commit 93688fd0ae631e26d8edb271279767eef7981a41. Change-Id: I2efa45201e70fda4c3b0b29af35ed948cbf9b5b3 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 66da86547d7..f984b12088b 100644 --- a/src/config/vnc_openstack/vnc_openstack/neutron_plugin_db.py +++ b/src/config/vnc_openstack/vnc_openstack/neutron_plugin_db.py @@ -2166,10 +2166,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():