author | Danek Duvall <danek.duvall@oracle.com> |
Mon, 20 Apr 2015 12:35:51 -0700 | |
branch | s11u2-sru |
changeset 4156 | 4b1def16fe9b |
child 5405 | 66fd59fecd68 |
permissions | -rw-r--r-- |
4156
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
1 |
This internal patch addresses an apparent Juno regression related to |
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
2 |
Launchpad bug 1252403. It's not suitable for the upstream but a bug |
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
3 |
report will be filed to cover the regression and eventually this patch |
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
4 |
should be replaced with something official. |
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
5 |
|
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
6 |
--- horizon-2014.2.2/openstack_dashboard/api/neutron.py.orig 2015-02-05 09:06:50.000000000 -0800 |
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
7 |
+++ horizon-2014.2.2/openstack_dashboard/api/neutron.py 2015-03-22 21:56:14.619688527 -0700 |
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
8 |
@@ -411,8 +411,7 @@ class FloatingIpManager(network_base.Flo |
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
9 |
in ext_net_ids)] |
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
10 |
reachable_subnets = set([p.fixed_ips[0]['subnet_id'] for p in ports |
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
11 |
if ((p.device_owner == |
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
12 |
- 'network:router_interface') |
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
13 |
- and (p.device_id in gw_routers))]) |
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
14 |
+ 'network:router_interface'))]) |
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
15 |
return reachable_subnets |
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
16 |
|
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
17 |
def list_targets(self): |