File 0002-Add-non-isolated-network-metadata-server-r... of Package openstack-neutron

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-Add-non-isolated-network-metadata-server-route.patch of Package openstack-neutron (Revision 0bf9581104f99d35faeef669456d5859)

Currently displaying revision 0bf9581104f99d35faeef669456d5859 , Show latest

From 9fd89f14eeed77cbaf6572e755cbaa01b51e60ae Mon Sep 17 00:00:00 2001
From: Pranav Salunke <dguitarbite@gmail.com>
Date: Fri, 6 Mar 2015 13:05:27 +0100
Subject: [PATCH] Add non-isolated network metadata server route

In some images routes may be pre-existing for the 169.254.0.0/16
network which makes the metadata server unreachable. This fix adds a
route to the metadata server IP setting the gateway IP as next hop
that makes the metadata server accessible even if a custom local
route is present.
---
 neutron/agent/linux/dhcp.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

Index: neutron-2014.2.4.dev36/neutron/agent/linux/dhcp.py
===================================================================
--- neutron-2014.2.4.dev36.orig/neutron/agent/linux/dhcp.py
+++ neutron-2014.2.4.dev36/neutron/agent/linux/dhcp.py
@@ -677,15 +677,15 @@ class Dnsmasq(DhcpLocalProcess):
                 else:
                     host_routes.append("%s,%s" % (hr.destination, hr.nexthop))
 
-            # Add host routes for isolated network segments
-
-            if (isolated_subnets[subnet.id] and
-                    self.conf.enable_isolated_metadata and
-                    subnet.ip_version == 4):
-                subnet_dhcp_ip = subnet_to_interface_ip[subnet.id]
-                host_routes.append(
-                    '%s/32,%s' % (METADATA_DEFAULT_IP, subnet_dhcp_ip)
-                )
+            if (subnet.ip_version == 4):
+                if(isolated_subnets[subnet.id]):
+                    if (self.conf.enable_isolated_metadata):
+                        subnet_dhcp_ip = subnet_to_interface_ip[subnet.id]
+                        host_routes.append(
+                            '%s/32,%s' % (METADATA_DEFAULT_IP, subnet_dhcp_ip))
+                else:
+                    host_routes.append(
+                        '%s/32,%s' % (METADATA_DEFAULT_IP, subnet.gateway_ip))
 
             if subnet.ip_version == 4:
                 if host_routes:

Places

File 0002-Add-non-isolated-network-metadata-server-route.patch of Package openstack-neutron (Revision 0bf9581104f99d35faeef669456d5859)

Places