openstack-nova: 2014.2-12.eayunstack.dev

0044-get-instance-object-from-compute-api.patch

Signed-off-by: blkart <[email protected]>

Author: blkart

packaging/openstack-nova/0044-get-instance-object-from-compute-api.patch

@@ -0,0 +1,41 @@
+From 50d80038cd6cf30245293d05271b0218f2d5e614 Mon Sep 17 00:00:00 2001
+From: blkart <[email protected]>
+Date: Wed, 6 Sep 2017 19:15:39 +0800
+Subject: [PATCH] get instance object from compute api
+
+Fix instance has no attribute 'info_cache' issue when
+associate/disassociate floating ip.
+
+Fix redmine #10873
+
+Signed-off-by: blkart <[email protected]>
+---
+ nova/api/openstack/compute/contrib/floating_ips.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/nova/api/openstack/compute/contrib/floating_ips.py b/nova/api/openstack/compute/contrib/floating_ips.py
+index 19a31ae..a23ada1 100644
+--- a/nova/api/openstack/compute/contrib/floating_ips.py
++++ b/nova/api/openstack/compute/contrib/floating_ips.py
+@@ -86,7 +86,7 @@ def get_instance_by_floating_ip_addr(self, context, address):
+     snagiibfa = self.network_api.get_instance_id_by_floating_address
+     instance_id = snagiibfa(context, address)
+     if instance_id:
+-        return self.compute_api.get(context, instance_id)
++        return self.compute_api.get(context, instance_id, want_objects=True)
+ 
+ 
+ def disassociate_floating_ip(self, context, instance, address):
+@@ -206,7 +206,8 @@ class FloatingIPActionController(wsgi.Controller):
+             msg = _("Address not specified")
+             raise webob.exc.HTTPBadRequest(explanation=msg)
+ 
+-        instance = common.get_instance(self.compute_api, context, id)
++        instance = common.get_instance(self.compute_api, context, id,
++                                       want_objects=True)
+         cached_nwinfo = compute_utils.get_nw_info_for_instance(instance)
+         if not cached_nwinfo:
+             msg = _('No nw_info cache associated with instance')
+-- 
+2.1.0
+

packaging/openstack-nova/openstack-nova.spec

@@ -8,7 +8,7 @@
 
 Name:             openstack-nova
 Version:          2014.2
-Release:          11%{?dist_eayunstack}
+Release:          12%{?dist_eayunstack}
 Summary:          OpenStack Compute (nova)
 
 Group:            Applications/System
@@ -88,6 +88,7 @@ Patch0040: 0040-Libvirt-register-config-opt-es_paas_network.patch
 Patch0041: 0041-Handle-exception-when-doing-detach_interface.patch
 Patch0042: 0042-Log-exception-from-deallocate_port_for_instance-for-.patch
 Patch0043: 0043-Refresh-instance-info-cache-within-lock.patch
+Patch0044: 0044-get-instance-object-from-compute-api.patch
 
 
 BuildArch:        noarch
@@ -534,6 +535,7 @@ This package contains documentation files for nova.
 %patch0041 -p1
 %patch0042 -p1
 %patch0043 -p1
+%patch0044 -p1
 
 find . \( -name .gitignore -o -name .placeholder \) -delete
 
@@ -891,6 +893,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Sep 7 2017 blkart <[email protected]> - 2014.2-12.eayunstack.dev
+- 0044-get-instance-object-from-compute-api.patch
+
 * Fri Aug 25 2017 blkart <[email protected]> - 2014.2-11.eayunstack.dev
 - 0041-Handle-exception-when-doing-detach_interface.patch
 - 0042-Log-exception-from-deallocate_port_for_instance-for-.patch