| author | Laszlo Peter <laszlo.peter@oracle.com> |
| Wed, 07 Sep 2016 14:48:42 -0700 | |
| changeset 6856 | 356aeea98c39 |
| parent 5405 | 66fd59fecd68 |
| permissions | -rw-r--r-- |
|
4010
b64e4d27c23b
20758033 remove extraneously pushed file out of components/openstack/common
david.comay@oracle.com
parents:
diff
changeset
|
1 |
This internal patch addresses an apparent Juno regression related to |
|
b64e4d27c23b
20758033 remove extraneously pushed file out of components/openstack/common
david.comay@oracle.com
parents:
diff
changeset
|
2 |
Launchpad bug 1252403. It's not suitable for the upstream but a bug |
|
b64e4d27c23b
20758033 remove extraneously pushed file out of components/openstack/common
david.comay@oracle.com
parents:
diff
changeset
|
3 |
report will be filed to cover the regression and eventually this patch |
|
b64e4d27c23b
20758033 remove extraneously pushed file out of components/openstack/common
david.comay@oracle.com
parents:
diff
changeset
|
4 |
should be replaced with something official. |
|
b64e4d27c23b
20758033 remove extraneously pushed file out of components/openstack/common
david.comay@oracle.com
parents:
diff
changeset
|
5 |
|
|
6856
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5405
diff
changeset
|
6 |
--- horizon-9.0.1/openstack_dashboard/api/neutron.py.~1~ 2016-06-02 13:05:56.000000000 -0700 |
|
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5405
diff
changeset
|
7 |
+++ horizon-9.0.1/openstack_dashboard/api/neutron.py 2016-06-29 23:54:56.882477825 -0700 |
|
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5405
diff
changeset
|
8 |
@@ -440,8 +440,7 @@ class FloatingIpManager(network_base.Flo |
|
4010
b64e4d27c23b
20758033 remove extraneously pushed file out of components/openstack/common
david.comay@oracle.com
parents:
diff
changeset
|
9 |
in ext_net_ids)] |
|
b64e4d27c23b
20758033 remove extraneously pushed file out of components/openstack/common
david.comay@oracle.com
parents:
diff
changeset
|
10 |
reachable_subnets = set([p.fixed_ips[0]['subnet_id'] for p in ports |
|
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4010
diff
changeset
|
11 |
if ((p.device_owner in |
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4010
diff
changeset
|
12 |
- ROUTER_INTERFACE_OWNERS) |
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4010
diff
changeset
|
13 |
- and (p.device_id in gw_routers))]) |
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4010
diff
changeset
|
14 |
+ ROUTER_INTERFACE_OWNERS))]) |
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4010
diff
changeset
|
15 |
# we have to include any shared subnets as well because we may not |
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4010
diff
changeset
|
16 |
# have permission to see the router interface to infer connectivity |
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4010
diff
changeset
|
17 |
shared = set([s.id for n in network_list(self.request, shared=True) |