Updated openstack/openstack
Project: openstack/nova  d5581223abf0b76b1dc856123c857d81d2104dac

Properly handle snatting for external gateways

Previously, snatting for netowrks with external gateways had to be
handled by manually setting:
 * public_interface = ''
 * force_snat_range = snat_range
Whereas networks with a gateway managed by nova needed:
 * public_interface = eth0
 * force_snat_range = None or ['0.0.0.0/0']

In order to support both simultaneously, we calcualate whether the
gateway is external, and use the force_snat_range and skip interface
if it is an external gateway. Otherwise, we use the setting for public
interface and 0.0.0.0/0. This allows external and internal gateways
to co-exist.

Partially-implements blueprint better-support-for-multiple-networks

Change-Id: Id5ec66946c3a82841a6dd2d019404e822cdafe64
Updated openstack/openstack
Project: openstack/ceilometer  0232968509e332b13d952dde3d79b2a20a1acb5d

Use auth_token from keystonemiddleware

auth_token middleware in python-keystoneclient is deprecated and has
been moved to the keystonemiddleware repo.

test_keystone_middleware_conf and
test_keystone_middleware_parse_conffile were removed. These tests
were relying on undocumented behavior (how the config options turn
into attributes). This doesn't work anymore since the
keystonemiddleware version doesn't provide any public API other than
calling it as a wsgi app, and then doesn't document what internal
operations it will do when called so isn't safe to be called in
unit tests. Tests verifying that the auth_token middleware can read
its config options should be done in keystonemiddleware.

Closes-Bug: #1342274

Change-Id: I1aadbe24db63eb2507b088cd53886d7f2e192cab