From 27081050093521365c86c7fad8b762ccbea33df2 Mon Sep 17 00:00:00 2001 From: Roman Bogorodskiy Date: Thu, 26 Jan 2017 14:27:19 +0000 Subject: [PATCH] www/py-horizon: fix floating ips Fix an issue with listing and disassociating floating IP addresses from the Horizon dashboard. PR: 216375 Submitted by: maintainer --- www/py-horizon/Makefile | 4 ++- .../files/02-fix-floating-ips.patch | 26 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 www/py-horizon/files/02-fix-floating-ips.patch diff --git a/www/py-horizon/Makefile b/www/py-horizon/Makefile index 1142c9a2606e..5ace60e526ad 100644 --- a/www/py-horizon/Makefile +++ b/www/py-horizon/Makefile @@ -3,6 +3,7 @@ PORTNAME= horizon PORTVERSION= 10.0.1 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= https://fossies.org/linux/misc/openstack/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -70,7 +71,8 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel \ ${PYTHON_PKGNAMEPREFIX}XStatic-term.js>=0.0.4:devel/py-XStatic-term.js \ ${PYTHON_PKGNAMEPREFIX}XStatic-tv4>=1.2.7.0:devel/py-XStatic-tv4 -EXTRA_PATCHES= ${FILESDIR}/01-django.patch:-p1 +EXTRA_PATCHES= ${FILESDIR}/01-django.patch:-p1 \ + ${FILESDIR}/02-fix-floating-ips.patch:-p1 NO_ARCH= yes diff --git a/www/py-horizon/files/02-fix-floating-ips.patch b/www/py-horizon/files/02-fix-floating-ips.patch new file mode 100644 index 000000000000..1ac4abb80f5b --- /dev/null +++ b/www/py-horizon/files/02-fix-floating-ips.patch @@ -0,0 +1,26 @@ +From 194ebeb4eb2efff32864452a52c2edfb4915b89a Mon Sep 17 00:00:00 2001 +From: Alexander Nusov +Date: Sun, 22 Jan 2017 13:31:51 +0300 +Subject: [PATCH] fixed floating IP list retrieving + +--- + openstack_dashboard/api/nova.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/openstack_dashboard/api/nova.py b/openstack_dashboard/api/nova.py +index 4a82cbc11..8a3936bad 100644 +--- a/openstack_dashboard/api/nova.py ++++ b/openstack_dashboard/api/nova.py +@@ -415,8 +415,7 @@ class FloatingIpManager(network_base.FloatingIpManager): + + def list(self, all_tenants=False): + return [FloatingIp(fip) for fip in +- self.client.floating_ips.list( +- all_tenants=all_tenants)] ++ self.client.floating_ips.list()] + + def get(self, floating_ip_id): + return FloatingIp(self.client.floating_ips.get(floating_ip_id)) +-- +2.11.0 +