From 255bc93de68331d450a33918b579460e000525cd Mon Sep 17 00:00:00 2001 From: Yuvaraja Mariappan Date: Fri, 2 Dec 2016 12:05:30 -0800 Subject: [PATCH] Revert "fix for the dhcp issue when multiple ips are associated with vmi" This reverts commit f72a548ce6ba492475405ae53ba0b0c9d1eccdb5. Change-Id: I41c2227d1f07672a75b8f8bab8dc9698fcf59703 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 60ac7f8e1cd..d0acc0641af 100644 --- a/src/config/vnc_openstack/vnc_openstack/neutron_plugin_db.py +++ b/src/config/vnc_openstack/vnc_openstack/neutron_plugin_db.py @@ -2111,10 +2111,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 ip_addr = ip_obj.get_instance_ip_address()