Updated openstack/openstack
Project: openstack-dev/devstack  df2cc34db60454e33aa2974509faa24b6d7093d4

Fix Neutron configuration if Ceilometer is enabled

Previously if Ceilometer service was enabled,
configuration option to enable Neutron network
notifications was not set. This fixes it.

Change-Id: Ia53d9db1828ef2daa0ce637b2a2635795856502c
Closes-Bug: #1340754
Updated openstack/openstack
Project: openstack/cinder  7037b06b4e2c5c5fae84f9da06c5d14f4d0cb424

Ensure FC ZoneManager is called

This patch ensures that the FC ZoneManager
is called during for all cases in Cinder
that does a volume attach/detach for FC
enabled drivers.
The problem was that we had code in the volume
manager that manually called the ZoneManager,
after initialize_connection and terminate_connection,
but other places in Cinder were not calling the
ZoneManager.
This patch creates 2 new decorators that can
be used for any driver's initialize_connection
and terminate_connection call.   The decorator
checks to make sure that the return value is for
a fibre_channel attachment and then calls the
ZoneManager's add_connection or delete_connection.
Change-Id: Ie3ae70785f500a140003ad3a8495e0ddc3516ea8
Closes-Bug: 1321798