Merge lp:~billy-olsen/horizon/icehouse-fix-lp1476417 into lp:~ubuntu-server-dev/horizon/icehouse

[Billy Olsen]

Remove the invocation to the FloatingIPManager.is_supported() method when retrieving floating IP addresses. The full integration of FloatingIPManager.is_supported() was introduced as a blueprint/new feature in the Juno release and the backport should not have contained this portion of the fix.

=== modified file 'debian/changelog'
--- debian/changelog	2015-06-23 13:29:00 +0000
+++ debian/changelog	2015-07-27 21:55:06 +0000
@@ -1,3 +1,12 @@
+horizon (1:2014.1.5-0ubuntu2) trusty; urgency=medium
+
+  * Fix "Unable to Connect to Neutron" error message which is displayed
+    in various UI panels. (LP: #1476417)
+    - d/p/fix-neutron-connection-error.patch - Removes the erroneous
+      usage of the FloatingIPManager.is_supported() method.
+
+ -- Billy Olsen <[e-mail]>  Mon, 27 Jul 2015 10:37:15 -0700
+
 horizon (1:2014.1.5-0ubuntu1) trusty; urgency=medium
 
   * Resynchronize with stable/icehouse (4ff165c) (LP: #1467533):

=== added file 'debian/patches/fix-neutron-connection-error.patch'
--- debian/patches/fix-neutron-connection-error.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-neutron-connection-error.patch	2015-07-27 21:55:06 +0000
@@ -0,0 +1,38 @@
+From 55ca4a0bee79d1ba660a1d52bcfa4660e44cb23c Mon Sep 17 00:00:00 2001
+From: Billy Olsen <[e-mail]>
+Date: Fri, 24 Jul 2015 16:30:46 -0700
+Subject: [PATCH 1/1] Fix "Unable to Connect to Neutron" error.
+
+Remove the check for FloatingIpManager.is_supported() in neutron.py when
+returning a list of floating IPs. The FloatingIpManager.is_supported method
+was part of the blueprint to hide floating IP information when a network is
+in use which doesn't support floating IPs.
+
+Closes-Bug: #1476417
+---
+ openstack_dashboard/api/neutron.py | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/openstack_dashboard/api/neutron.py b/openstack_dashboard/api/neutron.py
+index ddbd0af..d21ae9b 100644
+--- a/openstack_dashboard/api/neutron.py
++++ b/openstack_dashboard/api/neutron.py
+@@ -815,12 +815,9 @@ def servers_update_addresses(request, servers, all_tenants=False):
+             port_list, 'device_id', [instance.id for instance in servers],
+             request=request)
+         fips = FloatingIpManager(request)
+-        if fips.is_supported():
+-            floating_ips = list_resources_with_long_filters(
+-                fips.list, 'port_id', [port.id for port in ports],
+-                all_tenants=all_tenants)
+-        else:
+-            floating_ips = []
++        floating_ips = list_resources_with_long_filters(
++            fips.list, 'port_id', [port.id for port in ports],
++            all_tenants=all_tenants)
+         networks = list_resources_with_long_filters(
+             network_list, 'id', set([port.network_id for port in ports]),
+             request=request)
+-- 
+2.1.4
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-06-22 15:27:31 +0000
+++ debian/patches/series	2015-07-27 21:55:06 +0000
@@ -7,3 +7,4 @@
 #fix-ubuntu-tests.patch
 ubuntu_settings.patch
 fix-requirements.patch
+fix-neutron-connection-error.patch