Updated openstack/openstack
Project: openstack/neutron  68ea483d2396162e6baaa1a4caab800e01591edf
null
Fixing Arista CLI command

A minor change is made to the Arista API between ML2 Driver and the
back-end. This fix addresses this change to align Icehouse release with
Arista EOS releases.

Change-Id: Ia7cd3701c76d920a7e0d1334290c73ce7e8e5576
Closes-Bug: 1301093
(cherry picked from commit f3e9b6d6dc53d2e85c9085a1e3ec11b51f803948)
Updated openstack/openstack
Project: openstack/glance  e44867577fd65709a7848cd82caf77c56e34fe6d
null
Catch loading failures if transport_url is not set

The current implementation always tries to get a transport from
oslo.messaging assuming the transport_url option has been set. This is
done to keep backwards compatibility. However, since the default
`rpc_backend` is rabbit, it'll always try to load such driver. The
problem raises when `kombu` is not installed and the `notifier_strategy`
is set to qpid. This will make glance-api fail because it'll try to load
the rabbit driver *before* loading the qpid one.

This patch puts the first load attempt in a try / except block. The
error caught (if any) will be re-raised *just* if transport_url has been
configured, otherwise it'll move forward and try to load the notifier
driver using the old configuration options.

The patch also removes an obsolete test.

Change-Id: I00e653704463ea8245e2960050e0d5e6839f278a
Closes-bug: #1302661