Merge tag '2015.1_b2' into debian/kilo

Neutron kilo-2 milestone (2015.1.0b2)

diff --cc neutron/db/db_base_plugin_v2.py
Simple merge

diff --cc neutron/db/l3_db.py
index 0bdf508e00ffcde15c9e44c06f6c160553ee007a,3176d89bb4dc4eb022df316d2e26ad807c9a1958..7cdc83267d9a0fd1118006c8baa024f1a593ff34
--- 1/neutron/db/l3_db.py
--- 2/neutron/db/l3_db.py
+++ b/neutron/db/l3_db.py
@@@ -467,10 -507,15 +508,16 @@@ class L3_NAT_dbonly_mixin(l3.RouterPlug
  
      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']:
 +        if (not subnet['gateway_ip']
 +            and not ipv6_utils.is_slaac_subnet(subnet)):
              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
+                 and subnet['ipv6_address_mode'] is not None):
+             msg = (_('IPv6 subnet %s configured to receive RAs from an '
+                    'external router cannot be added to Neutron Router.') %
+                    subnet['id'])
+             raise n_exc.BadRequest(resource='router', msg=msg)
          self._check_for_dup_router_subnet(context, router,
                                            subnet['network_id'],
                                            subnet_id,