Removed diff with upstream tag.

diff --git a/.gitreview b/.gitreview
index 5a5040df173b92c4bd2cd9ea011497c238638a96..184583f0d665084b1f5418fc92eca2d4330e00ef 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,3 @@
 host=review.openstack.org
 port=29418
 project=openstack/neutron.git
-defaultbranch=stable/juno

diff --git a/neutron/db/db_base_plugin_v2.py b/neutron/db/db_base_plugin_v2.py
index 92e88658c8c7ea7c9740337b21d071d82aecb08d..184c1054b696f6a018eaf7e3aea532a6f8e3644a 100644 (file)
--- a/neutron/db/db_base_plugin_v2.py
+++ b/neutron/db/db_base_plugin_v2.py
@@ -1037,10 +1037,7 @@ class NeutronDbPluginV2(neutron_plugin_base_v2.NeutronPluginBaseV2,
         s = subnet['subnet']
 
         if s['gateway_ip'] is attributes.ATTR_NOT_SPECIFIED:
-            if s['ip_version'] == 6 and ipv6_utils.is_slaac_subnet(s):
-                s['gateway_ip'] = None
-            else:
-                s['gateway_ip'] = str(netaddr.IPAddress(net.first + 1))
+            s['gateway_ip'] = str(netaddr.IPAddress(net.first + 1))
 
         if s['allocation_pools'] == attributes.ATTR_NOT_SPECIFIED:
             s['allocation_pools'] = self._allocate_pools_for_subnet(context, s)

diff --git a/neutron/db/l3_db.py b/neutron/db/l3_db.py
index 7cdc83267d9a0fd1118006c8baa024f1a593ff34..3176d89bb4dc4eb022df316d2e26ad807c9a1958 100644 (file)
--- a/neutron/db/l3_db.py
+++ b/neutron/db/l3_db.py
@@ -21,7 +21,6 @@ from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api
 from neutron.api.v2 import attributes
 from neutron.common import constants as l3_constants
 from neutron.common import exceptions as n_exc
-from neutron.common import ipv6_utils
 from neutron.common import rpc as n_rpc
 from neutron.common import utils
 from neutron.db import model_base
@@ -508,8 +507,7 @@ class L3_NAT_dbonly_mixin(l3.RouterPluginBase):
 
     def _add_interface_by_subnet(self, context, router, subnet_id, owner):
         subnet = self._core_plugin._get_subnet(context, subnet_id)
-        if (not subnet['gateway_ip']
-            and not ipv6_utils.is_slaac_subnet(subnet)):
+        if not subnet['gateway_ip']:
             msg = _('Subnet for router interface must have a gateway IP')
             raise n_exc.BadRequest(resource='router', msg=msg)
         if (subnet['ip_version'] == 6 and subnet['ipv6_ra_mode'] is None