Updated openstack/openstack
Project: openstack/nova  4f621d2aea281ed7c7e5e0dd551acc72edfcf57a
null
Correct inheritance of nova.volume.cinder.API

nova.volume.cinder.API was deriving incorrectly from nova.db.base. This
patch simply removes that unnecessary import and changes
nova.volume.cinder.API to derive from object instead.

Change-Id: I5092b7fbb3780317a09a512aed7ecbe1d57a4428
Closes-bug: #1292997
Updated openstack/openstack
Project: openstack/neutron  3317d1c04da752fc7d2ec8926b646c3957431ee9
null
Create new IPv6 attributes for Subnets

* Introduces two new optional attributes for Subnets:
  * ipv6_ra_mode
  * ipv6_address_mode

Both attributes accept the following values:

* dhcpv6-stateful
* dhcpv6-stateless
* slaac

In addition to these values, additional behaviors are specified for
when only one of the attributes is set. For example, a Neutron network
that uses a physical router as a gateway, that transmits ICMPv6 Router
Advertisement packets to configure hosts on the network will create
Neutron Subnets that have ipv6_ra_mode *not* set, and ipv6_address_mode
set to 'slaac' so that Neutron will calculate EUI64 addresses for
each port assigned to the subnet, and not spawn a Dnsmasq process.

These attributes maintain backwards compatability with the enable_dhcp
Subnet attribute, by requiring a subnet with these attributes to also
have enable_dhcp set to True.

DocImpact

Implements bp ipv6-two-attributes
Change-Id: I5b2313fff5dca1c16ff939fdc4397d7f95ba3ba5