Updated openstack/openstack
Project: openstack-dev/devstack  bd546c600fa80fdee8f460e761581c0e87433d70
null
Update client-env to use openstackclient commands

Updated the only instance of a keystoneclient command, to
check if the identity service is enabled.

Change-Id: If86f71c1610a79690d6c6a8eb423b6fa234372bb
Updated openstack/openstack
Project: openstack/neutron  d7821281e982c984a5164a075f029d5991480145
null
Update ensure()/reconnect() to catch MessagingError

The error handling code that gets connections reset if necessary
caught ConnectionError. It really needs to catch MessagingError,
which ConnectionError inherits from. There are other types of
MessagingErrors that may occur, such as InternalError, and they need
to cause the connection to reset, as well.

This fix has already been merged into oslo.messaging.

--

Cherry-picked from oslo-incubator 234f64d608266f43d8856ff98c89ceba6699d752
See also https://bugzilla.redhat.com/show_bug.cgi?id=1086077

Closes-bug: #1303890
Change-Id: Ic5082b74a362ded8b35cbc75cf178fe6e0db62d0